[Scummvm-cvs-logs] CVS: scummvm/sky compact.h,1.18,1.19 control.cpp,1.104,1.105
Robert Göffringmann
lavosspawn at users.sourceforge.net
Tue Dec 13 07:28:04 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.87,1.88 kyra.h,1.45,1.46 screen.cpp,1.30,1.31
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.88,1.89 kyra.h,1.46,1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7186/sky
Modified Files:
compact.h control.cpp
Log Message:
make sure all Text compacts were killed after restoring a savegame
Index: compact.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- compact.h 18 Oct 2005 01:30:23 -0000 1.18
+++ compact.h 13 Dec 2005 15:27:32 -0000 1.19
@@ -33,6 +33,8 @@
enum CptIds {
CPT_JOEY = 1,
CPT_FOSTER = 3,
+ CPT_TEXT_1 = 0x17,
+ CPT_TEXT_11 = 0x21,
CPT_MENU_BAR = 0x2E,
CPT_REICH_DOOR_20 = 0x30AB,
CPT_MOVE_LIST = 0xBD,
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- control.cpp 13 Dec 2005 14:31:13 -0000 1.104
+++ control.cpp 13 Dec 2005 15:27:32 -0000 1.105
@@ -1396,6 +1396,10 @@
LODSW(srcPos, rawCpt[cnt]);
}
+ // make sure all text compacts are off
+ for (cnt = CPT_TEXT_1; cnt <= CPT_TEXT_11; cnt++)
+ _skyCompact->fetchCpt(cnt)->status = 0;
+
if (srcPos - srcBuf != (int32)size)
error("Restore failed! Savegame data = %d bytes. Expected size: %d", srcPos-srcBuf, size);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.87,1.88 kyra.h,1.45,1.46 screen.cpp,1.30,1.31
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.88,1.89 kyra.h,1.46,1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list