[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.135,2.136 vars.cpp,1.69,1.70

Travis Howell kirben at users.sourceforge.net
Mon Feb 9 07:26:12 CET 2004


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

Modified Files:
	intern.h vars.cpp 
Log Message:

Cleanup


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.135
retrieving revision 2.136
diff -u -d -r2.135 -r2.136
--- intern.h	9 Feb 2004 15:17:56 -0000	2.135
+++ intern.h	9 Feb 2004 15:22:31 -0000	2.136
@@ -556,7 +556,6 @@
 	virtual void executeOpcode(byte i);
 	virtual const char *getOpcodeDesc(byte i);
 
-	virtual void setupScummVars();
 	virtual void decodeParseString(int a, int b);
 
 	void unknownEA_func(int a, int b, int c, int d, int e);

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- vars.cpp	7 Feb 2004 02:23:24 -0000	1.69
+++ vars.cpp	9 Feb 2004 15:22:31 -0000	1.70
@@ -161,25 +161,6 @@
 	VAR_TIMEDATE_MINUTE = 126;
 }
 
-void ScummEngine_v6he::setupScummVars() {
-	// Many vars are the same as in V5 & V6 games, so just call the inherited method first
-	ScummEngine::setupScummVars();
-
-	VAR_V6_SCREEN_WIDTH = 41;
-	VAR_V6_SCREEN_HEIGHT = 54;
-	VAR_V6_EMSSPACE = 76;
-	VAR_RANDOM_NR = 118;
-	
-	VAR_V6_SOUNDMODE = 9;
-
-	VAR_TIMEDATE_YEAR = 119;
-	VAR_TIMEDATE_MONTH = 129;
-	VAR_TIMEDATE_DAY = 128;
-	VAR_TIMEDATE_HOUR = 125;
-	VAR_TIMEDATE_MINUTE = 126;
-}
-
-
 void ScummEngine_v7::setupScummVars() {
 	VAR_MOUSE_X = 1;
 	VAR_MOUSE_Y = 2;





More information about the Scummvm-git-logs mailing list