[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.37,2.38 scumm.h,1.149,1.150 script_v6.cpp,1.54,1.55 script_v8.cpp,2.136,2.137 vars.cpp,1.36,1.37

[Jonathan Gray]

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

Modified Files:
	intern.h scumm.h script_v6.cpp script_v8.cpp vars.cpp 
Log Message:
change getDateTime to be a v6 opcode, and hopefully not break anything

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -d -r2.37 -r2.38
--- intern.h	17 Feb 2003 21:42:33 -0000	2.37
+++ intern.h	18 Feb 2003 00:13:08 -0000	2.38
@@ -371,6 +371,7 @@
 	void o6_deleteFile();
 	void o6_findAllObjects();
 	void o6_pickVarRandom();
+	void o6_getDateTime();
 };
 
 class Scumm_v7 : public Scumm_v6
@@ -434,7 +435,6 @@
 	void o8_startVideo();
 	void o8_kernelSetFunctions();
 	void o8_kernelGetFunctions();
-	void o8_getDateTime();
 
 	void o8_getActorChore();
 
@@ -446,13 +446,6 @@
 	
 	void o8_getStringWidth();
 
-	/* V8 Scumm Vars */
-	byte VAR_TIMEDATE_YEAR;
-	byte VAR_TIMEDATE_MONTH;
-	byte VAR_TIMEDATE_DAY;
-	byte VAR_TIMEDATE_HOUR;
-	byte VAR_TIMEDATE_MINUTE;
-	byte VAR_TIMEDATE_SECOND;
 };
 
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- scumm.h	14 Feb 2003 16:01:55 -0000	1.149
+++ scumm.h	18 Feb 2003 00:13:15 -0000	1.150
@@ -1108,6 +1108,13 @@
 	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: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- script_v6.cpp	17 Feb 2003 21:42:32 -0000	1.54
+++ script_v6.cpp	18 Feb 2003 00:13:18 -0000	1.55
@@ -29,6 +29,7 @@
 #include "intern.h"
 #include "sound.h"
 #include "verbs.h"
+#include <time.h>
 #include "smush/player.h"
 #include "smush/scumm_renderer.h"
 
@@ -303,7 +304,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		/* D0 */
-		OPCODE(o6_invalid),
+		OPCODE(o6_getDateTime),
 		OPCODE(o6_stopTalking),
 		OPCODE(o6_getAnimateVariable),
 		OPCODE(o6_invalid),
@@ -2962,6 +2963,23 @@
 
 	// readArray(a, 0, ?);
 	push(2);
+}
+
+void Scumm_v6::o6_getDateTime()
+{
+	struct tm *t;
+	time_t now = time(NULL);
+	
+	t = localtime(&now);
+
+	_vars[VAR_TIMEDATE_YEAR] = t->tm_year;
+	_vars[VAR_TIMEDATE_MONTH] = t->tm_mon;
+	_vars[VAR_TIMEDATE_DAY] = t->tm_mday;
+	_vars[VAR_TIMEDATE_HOUR] = t->tm_hour;
+	_vars[VAR_TIMEDATE_MINUTE] = t->tm_min;
+	
+	if (_features & GF_AFTER_V8)
+	_vars[VAR_TIMEDATE_SECOND] = t->tm_sec;
 }
 
 void Scumm_v6::decodeParseString(int m, int n)

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.136
retrieving revision 2.137
diff -u -d -r2.136 -r2.137
--- script_v8.cpp	8 Feb 2003 01:27:21 -0000	2.136
+++ script_v8.cpp	18 Feb 2003 00:13:24 -0000	2.137
@@ -266,7 +266,7 @@
 		/* B4 */
 		OPCODE(o6_saveRestoreVerbs),
 		OPCODE(o6_setObjectName),
-		OPCODE(o8_getDateTime),
+		OPCODE(o6_getDateTime),
 		OPCODE(o6_drawBox),
 		/* B8 */
 		OPCODE(o6_invalid),
@@ -1358,20 +1358,6 @@
 	}
 }
 
-void Scumm_v8::o8_getDateTime()
-{
-	struct tm *t;
-	time_t now = time(NULL);
-	
-	t = localtime(&now);
-
-	_vars[VAR_TIMEDATE_YEAR] = t->tm_year;
-	_vars[VAR_TIMEDATE_MONTH] = t->tm_mon;
-	_vars[VAR_TIMEDATE_DAY] = t->tm_mday;
-	_vars[VAR_TIMEDATE_HOUR] = t->tm_hour;
-	_vars[VAR_TIMEDATE_MINUTE] = t->tm_min;
-	_vars[VAR_TIMEDATE_SECOND] = t->tm_sec;
-}
 
 void Scumm_v8::o8_startVideo()
 {

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- vars.cpp	29 Jan 2003 12:22:24 -0000	1.36
+++ vars.cpp	18 Feb 2003 00:13:24 -0000	1.37
@@ -109,6 +109,12 @@
 	VAR_V6_EMSSPACE = 76;
 	VAR_V6_RANDOM_NR = 118;
 
+	VAR_TIMEDATE_YEAR = 119;
+	VAR_TIMEDATE_MONTH = 129;
+	VAR_TIMEDATE_DAY = 128;
+	VAR_TIMEDATE_HOUR = 125;
+	VAR_TIMEDATE_MINUTE = 126;
+	
 	VAR_V6_SOUNDMODE = 9;
 }