[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.152,1.153 scumm.h,1.161,1.162 resource.cpp,1.82,1.83 insane.cpp,1.31,1.32

Max Horn fingolfin at users.sourceforge.net
Tue May 14 12:56:02 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv7727

Modified Files:
	scummvm.cpp scumm.h resource.cpp insane.cpp 
Log Message:
some cleanup

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- scummvm.cpp	14 May 2002 19:11:20 -0000	1.152
+++ scummvm.cpp	14 May 2002 19:55:39 -0000	1.153
@@ -1450,15 +1450,11 @@
 		scumm->_imuse = imuse;
 	}
 
-	scumm->delta = 6;
 	if (detector->_restore) {
 		scumm->_saveLoadSlot = 0;
 		scumm->_saveLoadFlag = 2;
 		scumm->_saveLoadCompatible = false;
 	}
-
-	scumm->delta = 0;
-
 
 	return scumm;
 }

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- scumm.h	14 May 2002 19:11:20 -0000	1.161
+++ scumm.h	14 May 2002 19:55:39 -0000	1.162
@@ -556,7 +556,6 @@
 	/* Scumm main loop */
 
 	void mainRun();
-	int delta; // global time
 
 	/* _insane vars */
 
@@ -741,8 +740,6 @@
 	void stopObjectCode();
 	void stopObjectScript(int script);
 
-
-	
 	/* Should be in Resource class */
 	byte _encbyte;
 	void *_fileHandle;
@@ -783,7 +780,7 @@
     void loadRoomObjectsSmall();
 	void readArrayFromIndexFile();
 	void readMAXS();
-	uint32 isGlobInMemory(int type, int index);
+	bool isGlobInMemory(int type, int index);
 	virtual void readIndexFile();
 	virtual void loadCharset(int i);
 	void nukeCharset(int i);

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- resource.cpp	13 May 2002 08:25:58 -0000	1.82
+++ resource.cpp	14 May 2002 19:55:39 -0000	1.83
@@ -1235,22 +1235,11 @@
 
 
 
-uint32 Scumm::isGlobInMemory(int type, int index)
-
+bool Scumm::isGlobInMemory(int type, int index)
 {
-
 	validateResource("isGlobInMemory",type,index);
 
-	
-
-	if(res.address[type][index]==NULL)
-
-		return(0);
-
-
-
-	return(1);
-
+	return res.address[type][index] != NULL;
 }
 
 

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- insane.cpp	13 May 2002 17:23:58 -0000	1.31
+++ insane.cpp	14 May 2002 19:55:39 -0000	1.32
@@ -1036,8 +1036,6 @@
 	sm->videoFinished = 0;
 	sm->_insaneState = 1;
 
-	sm->delta = 5;
-
 	do {
 		_frameChanged = 1;
 





More information about the Scummvm-git-logs mailing list