[Scummvm-cvs-logs] scummvm master -> f1c38696699240136a6340a6a6be4d2647da8676

[somaen]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f1c3869669 WINTERMUTE: Fix ScriptExtDate-saving (bump savegame-version to 1.2.1).


Commit: f1c38696699240136a6340a6a6be4d2647da8676
    https://github.com/scummvm/scummvm/commit/f1c38696699240136a6340a6a6be4d2647da8676
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-04-20T09:32:42-07:00

Commit Message:
WINTERMUTE: Fix ScriptExtDate-saving (bump savegame-version to 1.2.1).

This also fixes int->int32 in ScriptExtDate::transfer.

Changed paths:
    engines/wintermute/base/scriptables/script_ext_date.cpp
    engines/wintermute/dcgf.h



diff --git a/engines/wintermute/base/scriptables/script_ext_date.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp
index 53a1d36..afca0c4 100644
--- a/engines/wintermute/base/scriptables/script_ext_date.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_date.cpp
@@ -237,12 +237,29 @@ bool SXDate::scSetProperty(const char *name, ScValue *value) {
 bool SXDate::persist(BasePersistenceManager *persistMgr) {
 
 	BaseScriptable::persist(persistMgr);
-	persistMgr->transfer(TMEMBER(_tm.tm_year));
-	persistMgr->transfer(TMEMBER(_tm.tm_mon));
-	persistMgr->transfer(TMEMBER(_tm.tm_mday));
-	persistMgr->transfer(TMEMBER(_tm.tm_hour));
-	persistMgr->transfer(TMEMBER(_tm.tm_min));
-	persistMgr->transfer(TMEMBER(_tm.tm_sec));
+	int32 year = _tm.tm_year;
+	int32 mon = _tm.tm_mon;
+	int32 mday = _tm.tm_mday;
+	int32 hour = _tm.tm_hour;
+	int32 min = _tm.tm_min;
+	int32 sec = _tm.tm_sec;
+	persistMgr->transfer(TMEMBER(year));
+	persistMgr->transfer(TMEMBER(mon));
+	persistMgr->transfer(TMEMBER(mday));
+	persistMgr->transfer(TMEMBER(hour));
+	persistMgr->transfer(TMEMBER(min));
+	persistMgr->transfer(TMEMBER(sec));
+	if (persistMgr->checkVersion(1, 2, 1)) {
+		int32 wday = _tm.tm_wday;
+		persistMgr->transfer(TMEMBER(wday));
+		_tm.tm_wday = wday;
+	}
+	_tm.tm_year = year;
+	_tm.tm_mon = mon;
+	_tm.tm_mday = mday;
+	_tm.tm_hour = hour;
+	_tm.tm_min = min;
+	_tm.tm_sec = sec;
 	return STATUS_OK;
 }
 
diff --git a/engines/wintermute/dcgf.h b/engines/wintermute/dcgf.h
index 4f8e96e..fe92194 100644
--- a/engines/wintermute/dcgf.h
+++ b/engines/wintermute/dcgf.h
@@ -32,7 +32,7 @@
 
 //////////////////////////////////////////////////////////////////////////
 #define DCGF_VER_MAJOR 1
-#define DCGF_VER_MINOR 1
+#define DCGF_VER_MINOR 2
 #define DCGF_VER_BUILD 1
 #define DCGF_VER_SUFFIX "ScummVM"
 #define DCGF_VER_BETA true