Rename var

Add some changes ready for next save game version (Commented out)

svn-id: r14189

5 files changed, 31 insertions, 6 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 0925f193b2..04f7e46bdc 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -990,7 +990,7 @@ void Actor::drawActorCostume() {
 	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 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() {
 		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)),
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 54347e0a99..31cac1729e 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -223,7 +223,7 @@ void AkosRenderer::setPalette(byte *new_palette) {
 
 	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) {
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 4d70cff543..aa07434dad 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -183,6 +183,21 @@ bool ScummEngine::loadState(int slot, bool compat) {
 	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 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 			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;
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 91f500acec..53ed63eef4 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2594,10 +2594,10 @@ void ScummEngine::initRoomSubBlocks() {
 		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;
 		}
 	}
 			
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 052cfa0a86..4a4cd4e1dd 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1018,7 +1018,7 @@ protected:
 	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;