Renamed some HE-specific variables.

svn-id: r14083

4 files changed, 18 insertions, 18 deletions

diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index e36d960417..66c9e84f96 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->_he_actor_palette[palette[i]];
 	} else if (size == 256) {
 		byte color = new_palette[0];
 		if (color == 255) {
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index ab36942bd3..639fa462d1 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -661,36 +661,36 @@ void ScummEngine_v7he::o7_startSound() {
 
 	switch (op) {
 	case 224:
-		_staticVar1 = pop();
+		_heSndSoundFreq = pop();
 		break;
 
 	case 230:
-		_staticVar2 = pop();
+		_heSndVar2 = pop();
 		break;
 
 	case 231:
-		_staticVar3 = pop();
+		_heSndVar3 = pop();
 		break;
 
 	case 232:
-		_staticVar4 = pop();
-		_staticVar3 = 0;
-		_staticVar1 = 11025;
-		_staticVar2 = VAR(VAR_MUSIC_TIMER);
+		_heSndSoundId = pop();
+		_heSndVar3 = 0;
+		_heSndSoundFreq = 11025;
+		_heSndVar2 = VAR(VAR_MUSIC_TIMER);
 		break;
 
 	case 245:
-		_staticVar5 |= 1;
+		_heSndVar5 |= 1;
 		break;
 
 	case 255:
-		// _sound->addSoundToQueue(_staticVar4, _staticVar3, _staticVar2, _staticVar5);
+		// _sound->addSoundToQueue(_heSndSoundId, _heSndVar3, _heSndVar2, _heSndVar5);
 		// FIXME: Music resources (Id 4000+?) are currently unsupported,
 		// so don't attempt to play them.
- 		if (_staticVar4 < 4000)
-			_sound->addSoundToQueue(_staticVar4);
-		debug(1, "o7_startSound stub (%d, %d, %d, %d)", _staticVar4, _staticVar3, _staticVar2, _staticVar5);
-		_staticVar5 = 0;
+ 		if (_heSndSoundId < 4000)
+			_sound->addSoundToQueue(_heSndSoundId);
+		debug(1, "o7_startSound stub (%d, %d, %d, %d)", _heSndSoundId, _heSndVar3, _heSndVar2, _heSndVar5);
+		_heSndVar5 = 0;
 		break;
 
 	default:
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index f0f021329c..3f9aaeedd4 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2521,10 +2521,10 @@ void ScummEngine::initRoomSubBlocks() {
 		ptr = findResourceData(MKID('REMP'), roomptr);
 		if (ptr) {
 			for (i = 0; i < 256; i++)
-				he_actor_palette[i] = *ptr++;
+				_he_actor_palette[i] = *ptr++;
 		} else {
 			for (i = 0; i < 256; i++)
-				he_actor_palette[i] = i;
+				_he_actor_palette[i] = i;
 		}
 	}
 			
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 18b938597e..be150b4049 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1008,11 +1008,11 @@ protected:
 	bool testGfxOtherUsageBits(int strip, int bit);
 
 public:
-	byte he_actor_palette[256];
+	byte _he_actor_palette[256];
 	byte _proc_special_palette[256];
 	byte _roomPalette[256];
 	byte *_shadowPalette;
-	int _staticVar1, _staticVar2, _staticVar3, _staticVar4, _staticVar5;
+	int _heSndSoundFreq, _heSndVar2, _heSndVar3, _heSndSoundId, _heSndVar5;
 
 protected:
 	int _shadowPaletteSize;