[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.140,1.140.2.1 saveload.h,1.32,1.32.2.1 actor.cpp,1.229,1.229.2.1

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16066/scumm

Modified Files:
      Tag: branch-0-6-0
	saveload.cpp saveload.h actor.cpp 
Log Message:
save talkVolume

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.140
retrieving revision 1.140.2.1
diff -u -d -r1.140 -r1.140.2.1
--- saveload.cpp	31 Jan 2004 22:11:01 -0000	1.140
+++ saveload.cpp	17 Feb 2004 00:44:11 -0000	1.140.2.1
@@ -183,7 +183,7 @@
 	// 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];

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -d -r1.32 -r1.32.2.1
--- saveload.h	11 Jan 2004 19:58:29 -0000	1.32
+++ saveload.h	17 Feb 2004 00:44:12 -0000	1.32.2.1
@@ -32,7 +32,7 @@
 // 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

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.229
retrieving revision 1.229.2.1
diff -u -d -r1.229 -r1.229.2.1
--- actor.cpp	9 Feb 2004 08:05:23 -0000	1.229
+++ actor.cpp	17 Feb 2004 00:44:12 -0000	1.229.2.1
@@ -1743,6 +1743,7 @@
 		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)),