[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.254,1.255 saveload.cpp,1.158,1.159 saveload.h,1.35,1.36 script.cpp,1.159,1.160 script_v8.cpp,2.257,2.258

Travis Howell kirben at users.sourceforge.net
Sun Jul 11 05:00:20 CEST 2004


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

Modified Files:
	actor.cpp saveload.cpp saveload.h script.cpp script_v8.cpp 
Log Message:

Bump save game version for HE 7.0 changes
Remove mention of talkspeed default, since it no longer applies.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- actor.cpp	11 Jul 2004 10:47:25 -0000	1.254
+++ actor.cpp	11 Jul 2004 11:59:18 -0000	1.255
@@ -1746,6 +1746,8 @@
 	static const SaveLoadEntry actorEntries[] = {
 		MKLINE(Actor, _pos.x, sleInt16, VER(8)),
 		MKLINE(Actor, _pos.y, sleInt16, VER(8)),
+		MKLINE(Actor, offs_x, sleInt16, VER(32)),
+		MKLINE(Actor, offs_y, sleInt16, VER(32)),
 		MKLINE(Actor, top, sleInt16, VER(8)),
 		MKLINE(Actor, bottom, sleInt16, VER(8)),
 		MKLINE(Actor, elevation, sleInt16, VER(8)),
@@ -1775,11 +1777,9 @@
 		MKLINE(Actor, speedy, sleUint16, VER(8)),
 		MKLINE(Actor, cost.animCounter, sleUint16, VER(8)),
 		MKLINE(Actor, cost.soundCounter, sleByte, VER(8)),
-/*
 		MKLINE(Actor, actorDrawVirScr, sleByte, VER(32)),
 		MKLINE(Actor, flip, sleByte, VER(32)),
 		MKLINE(Actor, skipLimb, sleByte, VER(32)),
-*/
 
 		// Actor palette grew from 64 to 256 bytes
 		MKARRAY_OLD(Actor, palette[0], sleByte, 64, VER(8), VER(9)),

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- saveload.cpp	11 Jul 2004 09:15:14 -0000	1.158
+++ saveload.cpp	11 Jul 2004 11:59:18 -0000	1.159
@@ -183,7 +183,6 @@
 	if (_screenTop < 0)
 		_screenTop = 0;
 	
-/*
 	if (hdr.ver < VER(32) && _heversion == 70) {
 		roomptr = getResourceAddress(rtRoom, _roomResource);
 		const byte *ptr = findResourceData(MKID('REMP'), roomptr);
@@ -196,8 +195,6 @@
 		}
 	}
 
-*/
-
 	if (hdr.ver < VER(30)) {
 		// For a long time, we used incorrect location, causing it to default to zero.
 		if (_version == 8)
@@ -737,10 +734,8 @@
 			s->saveLoadArrayOf(_roomPalette, sizeof(_roomPalette), 1, sleByte);
 	}
 
-/*
 	if (savegameVersion >= VER(32) && _heversion == 70)
 			s->saveLoadArrayOf(_HEV7ActorPalette, sizeof(_HEV7ActorPalette), 1, sleByte);
-*/
 
 	// PalManip data was not saved before V10 save games
 	if (savegameVersion < VER(10))

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- saveload.h	2 May 2004 14:03:21 -0000	1.35
+++ saveload.h	11 Jul 2004 11:59:18 -0000	1.36
@@ -32,7 +32,7 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 31
+#define CURRENT_VER 32
 
 // 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: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- script.cpp	28 Jun 2004 09:03:08 -0000	1.159
+++ script.cpp	11 Jul 2004 11:59:18 -0000	1.160
@@ -552,8 +552,8 @@
 
 		// FIXME: Find some better place to put this.
 		if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) {
-			int talkspeed = ConfMan.getInt("talkspeed") / 20;
-			if (talkspeed >= 0 && talkspeed <= 180)
+			uint talkspeed = ConfMan.getInt("talkspeed");
+			if (talkspeed <= 9)
 				VAR(VAR_CHARINC) = talkspeed;
 		} else
 			_scummVars[var] = value;

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.257
retrieving revision 2.258
diff -u -d -r2.257 -r2.258
--- script_v8.cpp	10 Jul 2004 23:32:31 -0000	2.257
+++ script_v8.cpp	11 Jul 2004 11:59:18 -0000	2.258
@@ -426,8 +426,8 @@
 
 		if (var == VAR_CHARINC) {
 			if (ConfMan.hasKey("talkspeed")) {
-				int talkspeed = ConfMan.getInt("talkspeed") / 20;
-				if (talkspeed >= 0 && talkspeed <= 9)
+				uint talkspeed = ConfMan.getInt("talkspeed");
+				if (talkspeed <= 9)
 					VAR(VAR_CHARINC) = talkspeed;
 			} else
 				VAR(VAR_CHARINC) = (_features & GF_DEMO) ? value : (9 - value);





More information about the Scummvm-git-logs mailing list