Ticket #8416: gobtime.diff

gob/game.cpp

@@ -1714 +1714 @@
         int32 variablesCount;
         char *filePtr;
         char *savedIP;
-        //struct date dateVal;
         int16 i;
 
         oldNestLevel = inter_nestLevel;
@@ -1835 +1834 @@
                         inter_execPtr = (char *)game_totFileData;
                         inter_execPtr += READ_LE_UINT32((char *)game_totFileData + 0x64);
 
-/*
- * removed by olki to get it to compile.
-                        getdate(&dateVal);
-
-                        WRITE_LE_UINT32(inter_variables + 0x14), dateVal.da_year);
-                        WRITE_LE_UINT32(inter_variables + 0x18), dateVal.da_mon);
-                        WRITE_LE_UINT32(inter_variables + 0x1c), 0);
-                        WRITE_LE_UINT32(inter_variables + 0x20), dateVal.da_day);
-*/
-
                         inter_renewTimeInVars();
 
                         WRITE_VAR(13, useMouse);

gob/inter.cpp

@@ -745 +745 @@
 }
 
 void inter_renewTimeInVars(void) {
-        uint32 time = g_system->getMillis();
+        struct tm *t;
+        time_t now = time(NULL);
 
-        time /= 1000; // convert to seconds
+        t = localtime(&now);
 
-        // hours
-        WRITE_VAR(9, time / 3600);
-        time %= 3600;
-
-        // minutes
-        WRITE_VAR(10, time / 60);
-        time %= 60;
-
-        // seconds
-        WRITE_VAR(11, time);
+        WRITE_VAR(5, 1900 + t->tm_year);
+        WRITE_VAR(6, t->tm_mon);
+        WRITE_VAR(7, 0);
+        WRITE_VAR(8, t->tm_mday);
+        WRITE_VAR(9, t->tm_hour);
+        WRITE_VAR(10, t->tm_min);
+        WRITE_VAR(11, t->tm_sec);
 }
 
 void inter_playComposition(void) {