aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource.cpp
diff options
context:
space:
mode:
authorMax Horn2004-07-31 23:20:37 +0000
committerMax Horn2004-07-31 23:20:37 +0000
commitf0d6fd8c5ac3bf144eef93f146e9c056321e11db (patch)
tree8f4950325c8f81282724aad3365d9b9c04a5a447 /scumm/resource.cpp
parentc5836541fe4632792f6c7dbab8f01bf0459c03c3 (diff)
downloadscummvm-rg350-f0d6fd8c5ac3bf144eef93f146e9c056321e11db.tar.gz
scummvm-rg350-f0d6fd8c5ac3bf144eef93f146e9c056321e11db.tar.bz2
scummvm-rg350-f0d6fd8c5ac3bf144eef93f146e9c056321e11db.zip
isGlobInMemory == isResourceLoaded
svn-id: r14396
Diffstat (limited to 'scumm/resource.cpp')
-rw-r--r--scumm/resource.cpp10
1 files changed, 1 insertions, 9 deletions
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;