[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.273,2.274 scumm.h,1.502,1.503 scumm.cpp,1.237,1.238

[Max Horn]

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

Modified Files:
	intern.h scumm.h scumm.cpp 
Log Message:
cleanup

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.273
retrieving revision 2.274
diff -u -d -r2.273 -r2.274
--- intern.h	29 Sep 2004 11:25:21 -0000	2.273
+++ intern.h	29 Sep 2004 21:45:52 -0000	2.274
@@ -622,9 +622,11 @@
 		const char *desc;
 	};
 	
+	const OpcodeEntryv70he *_opcodesv70he;
+
 	Win32ResExtractor *_win32ResExtractor;
 
-	const OpcodeEntryv70he *_opcodesv70he;
+	int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndLoop;
 
 public:
 	ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -d -r1.502 -r1.503
--- scumm.h	28 Sep 2004 00:58:00 -0000	1.502
+++ scumm.h	29 Sep 2004 21:45:52 -0000	1.503
@@ -897,6 +897,10 @@
 	int _screenHeight, _screenWidth;
 	VirtScreen virtscr[4];		// Virtual screen areas
 	CameraData camera;			// 'Camera' - viewport
+
+	int _screenStartStrip, _screenEndStrip;
+	int _screenTop;
+
 protected:
 	ColorCycle _colorCycle[16];	// Palette cycles
 
@@ -1021,11 +1025,6 @@
 	uint _shakeFrame;
 	void setShake(int mode);
 
-public:
-	int _screenStartStrip, _screenEndStrip;
-	int _screenTop;
-
-protected:
 	int _blastObjectQueuePos; 
 	BlastObject _blastObjectQueue[128];
 
@@ -1069,10 +1068,8 @@
 
 public:
 	byte _HEV7ActorPalette[256];
-	byte _proc_special_palette[256];
 	byte _roomPalette[256];
 	byte *_shadowPalette;
-	int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndLoop;
 	bool _skipDrawObject, _skipProcessActors;
 	int _timers[4];
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- scumm.cpp	29 Sep 2004 09:42:36 -0000	1.237
+++ scumm.cpp	29 Sep 2004 21:45:52 -0000	1.238
@@ -648,7 +648,6 @@
 	_shadowPalette = NULL;
 	_shadowPaletteSize = 0;
 	memset(_currentPalette, 0, sizeof(_currentPalette));
-	memset(_proc_special_palette, 0, sizeof(_proc_special_palette));
 	memset(_HEV7ActorPalette, 0, sizeof(_HEV7ActorPalette));
 	_palDirtyMin = 0;
 	_palDirtyMax = 0;
@@ -693,11 +692,6 @@
 	memset(_auxBlocks, 0, sizeof(_auxBlocks));
 	_auxEntriesNum = 0;
 	memset(_auxEntries, 0, sizeof(_auxEntries));
-	_heSndSoundId = 0;
-	_heSndOffset = 0;
-	_heSndChannel = 0;
-	_heSndLoop = 0;
-	_heSndSoundFreq = 0;
 	memset(_timers, 0, sizeof(_timers));
 
 	memset(_akosQueue, 0, sizeof(_akosQueue));
@@ -1000,6 +994,12 @@
 ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16])
  : ScummEngine_v60he(detector, syst, gs, md5sum) {
 	 _win32ResExtractor = new Win32ResExtractor(this);
+
+	_heSndSoundId = 0;
+	_heSndOffset = 0;
+	_heSndChannel = 0;
+	_heSndLoop = 0;
+	_heSndSoundFreq = 0;
 }
 
 void ScummEngine::go() {