[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.252,1.253 akos.cpp,1.135,1.136 saveload.cpp,1.157,1.158 scumm.cpp,1.84,1.85 scumm.h,1.424,1.425
Travis Howell
kirben at users.sourceforge.net
Sun Jul 11 02:16:00 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4194/scumm
Modified Files:
actor.cpp akos.cpp saveload.cpp scumm.cpp scumm.h
Log Message:
Rename var
Add some changes ready for next save game version (Commented out)
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- actor.cpp 10 Jul 2004 23:32:31 -0000 1.252
+++ actor.cpp 11 Jul 2004 09:15:13 -0000 1.253
@@ -990,7 +990,7 @@
if (_vm->_features & GF_SMALL_HEADER)
bcr->_shadow_table = NULL;
else if (_vm->_heversion == 70)
- bcr->_shadow_table = _vm->_he_actor_palette;
+ bcr->_shadow_table = _vm->_HEV7ActorPalette;
else
bcr->_shadow_table = _vm->_shadowPalette;
@@ -1774,7 +1774,12 @@
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)),
MKARRAY(Actor, palette[0], sleByte, 256, VER(10)),
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- akos.cpp 9 Jul 2004 07:06:30 -0000 1.135
+++ akos.cpp 11 Jul 2004 09:15:13 -0000 1.136
@@ -223,7 +223,7 @@
if (_vm->_heversion == 70 && size) {
for (i = 0; i < size; i++)
- palette[i] = _vm->_he_actor_palette[palette[i]];
+ palette[i] = _vm->_HEV7ActorPalette[palette[i]];
} else if (size == 256) {
byte color = new_palette[0];
if (color == 255) {
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- saveload.cpp 25 Jun 2004 22:39:19 -0000 1.157
+++ saveload.cpp 11 Jul 2004 09:15:14 -0000 1.158
@@ -183,6 +183,21 @@
if (_screenTop < 0)
_screenTop = 0;
+/*
+ if (hdr.ver < VER(32) && _heversion == 70) {
+ roomptr = getResourceAddress(rtRoom, _roomResource);
+ const byte *ptr = findResourceData(MKID('REMP'), roomptr);
+ if (ptr) {
+ for (i = 0; i < 256; i++)
+ _HEV7ActorPalette[i] = *ptr++;
+ } else {
+ for (i = 0; i < 256; i++)
+ _HEV7ActorPalette[i] = i;
+ }
+ }
+
+*/
+
if (hdr.ver < VER(30)) {
// For a long time, we used incorrect location, causing it to default to zero.
if (_version == 8)
@@ -722,6 +737,11 @@
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))
_palManipCounter = 0;
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- scumm.cpp 11 Jul 2004 03:46:32 -0000 1.84
+++ scumm.cpp 11 Jul 2004 09:15:14 -0000 1.85
@@ -2594,10 +2594,10 @@
ptr = findResourceData(MKID('REMP'), roomptr);
if (ptr) {
for (i = 0; i < 256; i++)
- _he_actor_palette[i] = *ptr++;
+ _HEV7ActorPalette[i] = *ptr++;
} else {
for (i = 0; i < 256; i++)
- _he_actor_palette[i] = i;
+ _HEV7ActorPalette[i] = i;
}
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -d -r1.424 -r1.425
--- scumm.h 5 Jul 2004 06:25:01 -0000 1.424
+++ scumm.h 11 Jul 2004 09:15:14 -0000 1.425
@@ -1018,7 +1018,7 @@
bool testGfxOtherUsageBits(int strip, int bit);
public:
- byte _he_actor_palette[256];
+ byte _HEV7ActorPalette[256];
byte _proc_special_palette[256];
byte _roomPalette[256];
byte *_shadowPalette;
More information about the Scummvm-git-logs
mailing list