[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.129,1.130 script_v7he.cpp,2.24,2.25 scumm.cpp,1.62,1.63 scumm.h,1.415,1.416

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11111/scumm

Modified Files:
	akos.cpp script_v7he.cpp scumm.cpp scumm.h 
Log Message:
Renamed some HE-specific variables.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- akos.cpp	27 Jun 2004 10:54:25 -0000	1.129
+++ akos.cpp	27 Jun 2004 15:22:31 -0000	1.130
@@ -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->_he_actor_palette[palette[i]];
 	} else if (size == 256) {
 		byte color = new_palette[0];
 		if (color == 255) {

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.24
retrieving revision 2.25
diff -u -d -r2.24 -r2.25
--- script_v7he.cpp	25 Jun 2004 12:17:33 -0000	2.24
+++ script_v7he.cpp	27 Jun 2004 15:22:31 -0000	2.25
@@ -661,36 +661,36 @@
 
 	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:

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- scumm.cpp	27 Jun 2004 13:33:02 -0000	1.62
+++ scumm.cpp	27 Jun 2004 15:22:31 -0000	1.63
@@ -2521,10 +2521,10 @@
 		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;
 		}
 	}
 			

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -d -r1.415 -r1.416
--- scumm.h	27 Jun 2004 13:33:03 -0000	1.415
+++ scumm.h	27 Jun 2004 15:22:31 -0000	1.416
@@ -1008,11 +1008,11 @@
 	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;