[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.283,1.284 actor.h,1.62,1.63 saveload.cpp,1.169,1.170 saveload.h,1.40,1.41
Travis Howell
kirben at users.sourceforge.net
Thu Sep 9 18:04:06 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.233,2.234 script_v72he.cpp,2.69,2.70 script_v7he.cpp,2.67,2.68 script_v80he.cpp,2.11,2.12 script_v90he.cpp,2.19,2.20
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.183,1.184
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29668/scumm
Modified Files:
actor.cpp actor.h saveload.cpp saveload.h
Log Message:
Save game changes for HE80+ games.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- actor.cpp 9 Sep 2004 02:21:48 -0000 1.283
+++ actor.cpp 10 Sep 2004 01:03:01 -0000 1.284
@@ -1915,7 +1915,8 @@
MKLINE(Actor, needRedraw, sleByte, VER(8)),
MKLINE(Actor, needBgReset, sleByte, VER(8)),
MKLINE(Actor, costumeNeedsInit, sleByte, VER(8)),
-
+ MKLINE(Actor, condMask, sleUint32, VER(38)),
+
MKLINE(Actor, talkPosY, sleInt16, VER(8)),
MKLINE(Actor, talkPosX, sleInt16, VER(8)),
MKLINE(Actor, ignoreTurns, sleByte, VER(8)),
@@ -1924,7 +1925,7 @@
MKLINE(Actor, talkScript, sleUint16, VER(8)),
MKLINE(Actor, walkScript, sleUint16, VER(8)),
-
+
MKLINE(Actor, walkdata.dest.x, sleInt16, VER(8)),
MKLINE(Actor, walkdata.dest.y, sleInt16, VER(8)),
MKLINE(Actor, walkdata.destbox, sleByte, VER(8)),
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- actor.h 8 Sep 2004 21:14:12 -0000 1.62
+++ actor.h 10 Sep 2004 01:03:01 -0000 1.63
@@ -123,7 +123,7 @@
int8 layer;
uint16 sound[32];
CostumeData cost;
- uint32 condMask; // XXX save/load
+ uint32 condMask;
protected:
byte palette[256];
int elevation;
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- saveload.cpp 14 Aug 2004 19:41:59 -0000 1.169
+++ saveload.cpp 10 Sep 2004 01:03:01 -0000 1.170
@@ -776,6 +776,9 @@
var120Backup = _scummVars[120];
var98Backup = _scummVars[98];
+ if (savegameVersion > VER(37))
+ s->saveLoadArrayOf(_roomVars, _numRoomVariables, sizeof(_roomVars[0]), sleInt32);
+
// The variables grew from 16 to 32 bit.
if (savegameVersion < VER(15))
s->saveLoadArrayOf(_scummVars, _numVariables, sizeof(_scummVars[0]), sleInt16);
Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- saveload.h 5 Sep 2004 09:36:50 -0000 1.40
+++ saveload.h 10 Sep 2004 01:03:01 -0000 1.41
@@ -32,7 +32,7 @@
// Can be useful for other ports too :)
#define VER(x) x
-#define CURRENT_VER 37
+#define CURRENT_VER 38
// 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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.233,2.234 script_v72he.cpp,2.69,2.70 script_v7he.cpp,2.67,2.68 script_v80he.cpp,2.11,2.12 script_v90he.cpp,2.19,2.20
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.183,1.184
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list