[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.434,1.435 resource.cpp,1.232,1.233 akos.cpp,1.136,1.137

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11308

Modified Files:
	scumm.h resource.cpp akos.cpp 
Log Message:
isGlobInMemory == isResourceLoaded

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -d -r1.434 -r1.435
--- scumm.h	26 Jul 2004 23:15:01 -0000	1.434
+++ scumm.h	31 Jul 2004 23:20:37 -0000	1.435
@@ -661,7 +661,6 @@
 	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);

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- resource.cpp	26 Jul 2004 23:15:01 -0000	1.232
+++ resource.cpp	31 Jul 2004 23:20:37 -0000	1.233
@@ -2201,7 +2201,7 @@
 }
 
 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 @@
 	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;

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- akos.cpp	11 Jul 2004 09:15:13 -0000	1.136
+++ akos.cpp	31 Jul 2004 23:20:37 -0000	1.137
@@ -588,7 +588,7 @@
 
 	/* 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);
 	}