aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMax Horn2009-10-08 19:41:38 +0000
committerMax Horn2009-10-08 19:41:38 +0000
commit42120ed626c0d18bc1e1738678dbd1fa96481f04 (patch)
tree90715ea5e5bb3f3f24547f484b2355194b9cd93c /engines/sci/engine
parentf5ccaf7e29183d6e51456d5994eccfd35ff9a117 (diff)
downloadscummvm-rg350-42120ed626c0d18bc1e1738678dbd1fa96481f04.tar.gz
scummvm-rg350-42120ed626c0d18bc1e1738678dbd1fa96481f04.tar.bz2
scummvm-rg350-42120ed626c0d18bc1e1738678dbd1fa96481f04.zip
Introduce a new struct TimeDate, replacing struct tm in client code. May lead to compilation issues in ports, which should be trivial to fix, though
svn-id: r44793
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kmisc.cpp4
-rw-r--r--engines/sci/engine/savegame.cpp5
2 files changed, 2 insertions, 7 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index dbe562b25a..46533f4e34 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -25,8 +25,6 @@
#include "common/system.h"
-#include <time.h> // FIXME: For struct tm
-
#include "sci/sci.h"
#include "sci/debug.h"
#include "sci/engine/state.h"
@@ -115,7 +113,7 @@ enum {
};
reg_t kGetTime(EngineState *s, int argc, reg_t *argv) {
- tm loc_time;
+ TimeDate loc_time;
uint32 elapsedTime;
int retval = 0; // Avoid spurious warning
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 199c27e1a6..0779085612 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -28,9 +28,6 @@
#include "common/func.h"
#include "common/serializer.h"
-#include <time.h> // FIXME: For struct tm
-
-
#include "sci/sci.h"
#include "sci/gfx/operations.h"
#include "sci/gfx/menubar.h"
@@ -497,7 +494,7 @@ static void sync_songlib_t(Common::Serializer &s, SongLibrary &obj) {
int gamestate_save(EngineState *s, Common::WriteStream *fh, const char* savename, const char *version) {
- tm curTime;
+ TimeDate curTime;
g_system->getTimeAndDate(curTime);
SavegameMetadata meta;