[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.38,2.39 script_v6.cpp,1.55,1.56 scumm.h,1.150,1.151 vars.cpp,1.37,1.38

Max Horn fingolfin at users.sourceforge.net
Mon Feb 17 17:52:02 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30568/scumm

Modified Files:
	intern.h script_v6.cpp scumm.h vars.cpp 
Log Message:
cleanup

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -d -r2.38 -r2.39
--- intern.h	18 Feb 2003 00:13:08 -0000	2.38
+++ intern.h	18 Feb 2003 01:51:04 -0000	2.39
@@ -207,6 +207,8 @@
 	virtual void executeOpcode(int i);
 	virtual const char *getOpcodeDesc(int i);
 
+	virtual void setupScummVars();
+
 	int popRoomAndObj(int *room);
 
 	virtual void decodeParseString(int a, int b);
@@ -372,6 +374,15 @@
 	void o6_findAllObjects();
 	void o6_pickVarRandom();
 	void o6_getDateTime();
+
+	byte VAR_VIDEONAME;
+
+	byte VAR_TIMEDATE_YEAR;
+	byte VAR_TIMEDATE_MONTH;
+	byte VAR_TIMEDATE_DAY;
+	byte VAR_TIMEDATE_HOUR;
+	byte VAR_TIMEDATE_MINUTE;
+	byte VAR_TIMEDATE_SECOND;
 };
 
 class Scumm_v7 : public Scumm_v6

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- script_v6.cpp	18 Feb 2003 00:13:18 -0000	1.55
+++ script_v6.cpp	18 Feb 2003 01:51:05 -0000	1.56
@@ -2979,7 +2979,7 @@
 	_vars[VAR_TIMEDATE_MINUTE] = t->tm_min;
 	
 	if (_features & GF_AFTER_V8)
-	_vars[VAR_TIMEDATE_SECOND] = t->tm_sec;
+		_vars[VAR_TIMEDATE_SECOND] = t->tm_sec;
 }
 
 void Scumm_v6::decodeParseString(int m, int n)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- scumm.h	18 Feb 2003 00:13:15 -0000	1.150
+++ scumm.h	18 Feb 2003 01:51:05 -0000	1.151
@@ -1106,15 +1106,7 @@
 	byte VAR_CHARSET_MASK;
 
 	byte VAR_CUSTOMSCALETABLE;
-	byte VAR_VIDEONAME;
 	byte VAR_V6_SOUNDMODE;
-
-	byte VAR_TIMEDATE_YEAR;
-	byte VAR_TIMEDATE_MONTH;
-	byte VAR_TIMEDATE_DAY;
-	byte VAR_TIMEDATE_HOUR;
-	byte VAR_TIMEDATE_MINUTE;
-	byte VAR_TIMEDATE_SECOND;
 };
 
 // This is a constant lookup table of reverse bit masks

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- vars.cpp	18 Feb 2003 00:13:24 -0000	1.37
+++ vars.cpp	18 Feb 2003 01:51:05 -0000	1.38
@@ -108,16 +108,21 @@
 	VAR_V6_SCREEN_HEIGHT = 54;
 	VAR_V6_EMSSPACE = 76;
 	VAR_V6_RANDOM_NR = 118;
+	
+	VAR_V6_SOUNDMODE = 9;
+}
+
+void Scumm_v6::setupScummVars()
+{
+	// Many vars are the same as in V5 games, so just call the inherited method first
+	Scumm::setupScummVars();
 
 	VAR_TIMEDATE_YEAR = 119;
 	VAR_TIMEDATE_MONTH = 129;
 	VAR_TIMEDATE_DAY = 128;
 	VAR_TIMEDATE_HOUR = 125;
 	VAR_TIMEDATE_MINUTE = 126;
-	
-	VAR_V6_SOUNDMODE = 9;
 }
-
 
 void Scumm_v7::setupScummVars()
 {





More information about the Scummvm-git-logs mailing list