save talkVolume

svn-id: r12919

TODO

@@ -36,7 +36,7 @@ General
 * In OSystem, replace all the TOGGLE properties by GET/SET ones. E.g.
   instead of PROP_TOGGLE_FULLSCREEN have PROP_SET_FULLSCREEN and
   PROP_GET_FULLSCREEN.
-  Alternatively (my prefered solution) use plain methods for this:
+  Alternatively (my preferred solution) use plain methods for this:
     void OSystem::setFullscreen(bool)
   and
     bool OSystem::getFullscreen()
@@ -177,7 +177,6 @@ Config Manager
 
 SCUMM
 =====
-* Add actor talkVolume to savegames
 * Fix C64 costume code
 * Make it possible to restart games properly
 * Add support for handling Kanji in FM Towns games (foreground is rendered on a

scumm/actor.cpp

@@ -1744,6 +1744,7 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() {
 		MKLINE(Actor, talkColor, sleByte, VER(8)),
 		MKLINE(Actor, talkFrequency, sleInt16, VER(16)),
 		MKLINE(Actor, talkPan, sleInt16, VER(24)),
+		MKLINE(Actor, talkVolume, sleInt16, VER(29)),
 		MKLINE(Actor, scalex, sleByte, VER(8)),
 		MKLINE(Actor, scaley, sleByte, VER(8)),
 		MKLINE(Actor, charset, sleByte, VER(8)),

scumm/saveload.cpp

@@ -183,7 +183,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) {
 	// scumm vars. We now know the proper locations. To be able to properly use
 	// old save games, we update the old (bad) variables to the new (correct)
 	// ones.
-	if (hdr.ver <= 27 && _version == 8) {
+	if (hdr.ver < 28 && _version == 8) {
 		_scummVars[VAR_CAMERA_MIN_X] = _scummVars[101];
 		_scummVars[VAR_CAMERA_MAX_X] = _scummVars[102];
 		_scummVars[VAR_CAMERA_MIN_Y] = _scummVars[103];

scumm/saveload.h

@@ -32,7 +32,7 @@ namespace Scumm {
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 28
+#define CURRENT_VER 29
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
 // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC