[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.26,2.27 script_v8.cpp,2.84,2.85 scumm.h,1.122,1.123 vars.cpp,1.26,1.27
Max Horn
fingolfin at users.sourceforge.net
Tue Dec 31 09:29:05 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2983
Modified Files:
intern.h script_v8.cpp scumm.h vars.cpp
Log Message:
implemented o8_getDateTime
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -d -r2.26 -r2.27
--- intern.h 30 Dec 2002 17:05:36 -0000 2.26
+++ intern.h 31 Dec 2002 17:28:50 -0000 2.27
@@ -439,6 +439,14 @@
void o8_getObjectImageHeight();
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: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.84
retrieving revision 2.85
diff -u -d -r2.84 -r2.85
--- script_v8.cpp 31 Dec 2002 15:26:02 -0000 2.84
+++ script_v8.cpp 31 Dec 2002 17:28:50 -0000 2.85
@@ -30,11 +30,8 @@
#include "smush/player.h"
#include "smush/scumm_renderer.h"
-/*
- * NO, we do NOT support CMI yet :-) This file is mostly a placeholder and a place
- * to grow real support in. For now, only a few opcodes are implemented, and they
- * might even be wrong... so don't hold your breath.
- */
+#include <time.h>
+
#define OPCODE(x) { &Scumm_v8::x, #x }
@@ -1294,7 +1291,17 @@
void Scumm_v8::o8_getDateTime()
{
- warning("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: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- scumm.h 31 Dec 2002 02:09:57 -0000 1.122
+++ scumm.h 31 Dec 2002 17:28:50 -0000 1.123
@@ -934,7 +934,7 @@
byte VAR_ME;
byte VAR_NUM_ACTOR;
byte VAR_CURRENT_LIGHTS;
- byte VAR_CURRENTDRIVE;
+ byte VAR_CURRENTDRIVE; // How about merging this with VAR_CURRENTDISK?
byte VAR_CURRENTDISK;
byte VAR_TMR_1;
byte VAR_TMR_2;
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- vars.cpp 30 Dec 2002 12:56:00 -0000 1.26
+++ vars.cpp 31 Dec 2002 17:28:51 -0000 1.27
@@ -227,12 +227,12 @@
VAR_HAVE_MSG = 15;
VAR_MOUSE_BUTTONS = 16;
- // VAR_TIMEDATE_YEAR = 24;
- // VAR_TIMEDATE_MONTH = 25;
- // VAR_TIMEDATE_DAY = 26;
- // VAR_TIMEDATE_HOUR = 27;
- // VAR_TIMEDATE_MINUTE = 28;
- // VAR_TIMEDATE_SECOND = 29;
+ VAR_TIMEDATE_YEAR = 24;
+ VAR_TIMEDATE_MONTH = 25;
+ VAR_TIMEDATE_DAY = 26;
+ VAR_TIMEDATE_HOUR = 27;
+ VAR_TIMEDATE_MINUTE = 28;
+ VAR_TIMEDATE_SECOND = 29;
//VAR_OVERRIDE = 30; // Oops. 30 has something to do with overrides, but this isn't it..
VAR_ROOM = 31;
More information about the Scummvm-git-logs
mailing list