diff options
| author | Max Horn | 2004-07-31 23:20:37 +0000 |
|---|---|---|
| committer | Max Horn | 2004-07-31 23:20:37 +0000 |
| commit | f0d6fd8c5ac3bf144eef93f146e9c056321e11db (patch) | |
| tree | 8f4950325c8f81282724aad3365d9b9c04a5a447 | |
| parent | c5836541fe4632792f6c7dbab8f01bf0459c03c3 (diff) | |
| download | scummvm-rg350-f0d6fd8c5ac3bf144eef93f146e9c056321e11db.tar.gz scummvm-rg350-f0d6fd8c5ac3bf144eef93f146e9c056321e11db.tar.bz2 scummvm-rg350-f0d6fd8c5ac3bf144eef93f146e9c056321e11db.zip | |
isGlobInMemory == isResourceLoaded
svn-id: r14396
| -rw-r--r-- | scumm/akos.cpp | 2 | ||||
| -rw-r--r-- | scumm/resource.cpp | 10 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 |
3 files changed, 2 insertions, 11 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp index 31cac1729e..5cf8344375 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -588,7 +588,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) { /* implement custom scale table */ v1.scaletable = (_vm->_features & GF_HUMONGOUS) ? oldScaleTable : defaultScaleTable; - if (_vm->VAR_CUSTOMSCALETABLE != 0xFF && _vm->isGlobInMemory(rtString, _vm->VAR(_vm->VAR_CUSTOMSCALETABLE))) { + if (_vm->VAR_CUSTOMSCALETABLE != 0xFF && _vm->isResourceLoaded(rtString, _vm->VAR(_vm->VAR_CUSTOMSCALETABLE))) { v1.scaletable = _vm->getStringAddressVar(_vm->VAR_CUSTOMSCALETABLE); } diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 4b9b64324d..0a9f253311 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -2201,7 +2201,7 @@ void ScummEngine::loadPtrToResource(int type, int resindex, const byte *source) } bool ScummEngine::isResourceLoaded(int type, int idx) const { - if (!validateResource("isLoaded", type, idx)) + if (!validateResource("isResourceLoaded", type, idx)) return false; return res.address[type][idx] != NULL; } @@ -2426,14 +2426,6 @@ void ScummEngine::allocateArrays() { allocResTypeData(rtImage, MKID('AWIZ'), _numImages, "images", 1); } - -bool ScummEngine::isGlobInMemory(int type, int idx) const{ - if (!validateResource("isGlobInMemory", type, idx)) - return false; - - return res.address[type][idx] != NULL; -} - void ScummEngine::dumpResource(const char *tag, int idx, const byte *ptr, int length) { char buf[256]; File out; diff --git a/scumm/scumm.h b/scumm/scumm.h index 8b0a022185..ec6317201c 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -661,7 +661,6 @@ protected: int getResourceSize(int type, int idx); public: - bool isGlobInMemory(int type, int index) const; bool isResourceLoaded(int type, int index) const; byte *getResourceAddress(int type, int i); byte *getStringAddress(int i); |