Cleanup.

svn-id: r39260

3 files changed, 30 insertions, 29 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index bde4c2c3fc..56c7ff0c14 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -64,9 +64,11 @@ static const GameSpecificSettings puzzlepack_settings = {
 AGOSEngine_PuzzlePack::AGOSEngine_PuzzlePack(OSystem *system)
 	: AGOSEngine_Feeble(system) {
 
+	_oopsValid = false;
 	_iconToggleCount = 0;
 	_voiceCount = 0;
 
+	_gameTime = 0;
 	_lastTickCount = 0;
 	_thisTickCount = 0;
 	_startSecondCount = 0;
@@ -75,6 +77,8 @@ AGOSEngine_PuzzlePack::AGOSEngine_PuzzlePack(OSystem *system)
 
 AGOSEngine_Feeble::AGOSEngine_Feeble(OSystem *system)
 	: AGOSEngine_Simon2(system) {
+
+	_vgaCurSpritePriority = 0;
 }
 
 AGOSEngine_Simon2::AGOSEngine_Simon2(OSystem *system)
@@ -87,6 +91,19 @@ AGOSEngine_Simon1::AGOSEngine_Simon1(OSystem *system)
 
 AGOSEngine_Waxworks::AGOSEngine_Waxworks(OSystem *system)
 	: AGOSEngine_Elvira2(system) {
+
+	_boxCR = false;
+	_boxLineCount = 0;
+	memset(_boxBuffer, 0, sizeof(_boxBuffer));
+	_boxBufferPtr = _boxBuffer;
+
+	_linePtrs[0] = 0;
+	_linePtrs[1] = 0;
+	_linePtrs[2] = 0;
+	_linePtrs[3] = 0;
+	_linePtrs[4] = 0;
+	_linePtrs[5] = 0;
+	memset(_lineCounts, 0, sizeof(_lineCounts));
 }
 
 AGOSEngine_Elvira2::AGOSEngine_Elvira2(OSystem *system)
@@ -99,6 +116,7 @@ AGOSEngine_Elvira1::AGOSEngine_Elvira1(OSystem *system)
 
 AGOSEngine::AGOSEngine(OSystem *syst)
 	: Engine(syst) {
+
 	_vcPtr = 0;
 	_vcGetOutOfCode = 0;
 	_gameOffsetsPtr = 0;
@@ -282,7 +300,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 
 	_clockStopped = 0;
 	_gameStoppedClock = 0;
-	_gameTime = 0;
 	_lastTime = 0;
 	_lastMinute = 0;
 
@@ -360,7 +377,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 
 	_vgaCurZoneNum = 0;
 	_vgaCurSpriteId = 0;
-	_vgaCurSpritePriority = 0;
 
 	_baseY = 0;
 	_scale = 0;
@@ -395,19 +411,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	_superRoomNumber = 0;
 	_wallOn = 0;
 
-	_boxCR = false;
-	_boxLineCount = 0;
-	memset(_boxBuffer, 0, sizeof(_boxBuffer));
-	_boxBufferPtr = _boxBuffer;
-
-	_linePtrs[0] = 0;
-	_linePtrs[1] = 0;
-	_linePtrs[2] = 0;
-	_linePtrs[3] = 0;
-	_linePtrs[4] = 0;
-	_linePtrs[5] = 0;
-	memset(_lineCounts, 0, sizeof(_lineCounts));
-
 	memset(_objectArray, 0, sizeof(_objectArray));
 	memset(_itemStore, 0, sizeof(_itemStore));
 	memset(_textMenu, 0, sizeof(_textMenu));
@@ -491,8 +494,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	_saveOrLoad = false;
 	_saveLoadEdit = false;
 
-	_oopsValid = false;
-
 	_hyperLink = 0;
 	_interactY = 0;
 	_oracleMaxScrollY = 0;
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 2b66b751f8..e11a202ae9 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -329,13 +329,6 @@ protected:
 	const byte *_scrollImage;
 	byte _boxStarHeight;
 
-	bool _boxCR;
-	char _boxBuffer[310];
-	char *_boxBufferPtr;
-	int _boxLineCount;
-	int _lineCounts[6];
-	char *_linePtrs[6];
-
 	SubroutineLine *_classLine;
 	int16 _classMask, _classMode1, _classMode2;
 	Item *_findNextPtr;
@@ -391,7 +384,7 @@ protected:
 
 	uint32 _lastMinute; // Used in processSpecialKeys()
 	uint32 _lastTime;
-	uint32 _clockStopped, _gameStoppedClock, _gameTime;
+	uint32 _clockStopped, _gameStoppedClock;
 	uint32 _timeStore;
 
 	TimeEvent *_firstTimeStruct, *_pendingDeleteTimeEvent;
@@ -462,7 +455,6 @@ protected:
 	uint16 _zoneNumber;
 	uint16 _vgaWaitFor, _lastVgaWaitFor;
 	uint16 _vgaCurSpriteId, _vgaCurZoneNum;
-	uint16 _vgaCurSpritePriority;
 
 	int16 _baseY;
 	float _scale;
@@ -582,8 +574,6 @@ protected:
 	byte _saveLoadType, _saveLoadSlot;
 	char _saveLoadName[108];
 
-	bool _oopsValid;
-
 	byte *_backGroundBuf;
 	byte *_backBuf;
 	byte *_scaleBuf;
@@ -1743,6 +1733,13 @@ protected:
 
 	const OpcodeEntryWaxworks *_opcodesWaxworks;
 
+	bool _boxCR;
+	char _boxBuffer[310];
+	char *_boxBufferPtr;
+	int _boxLineCount;
+	int _lineCounts[6];
+	char *_linePtrs[6];
+
 	virtual void drawIcon(WindowBlock *window, uint icon, uint x, uint y);
 
 	virtual void boxController(uint x, uint y, uint mode);
@@ -1930,6 +1927,8 @@ protected:
 
 	const OpcodeEntryFeeble *_opcodesFeeble;
 
+	uint16 _vgaCurSpritePriority;
+
 	virtual uint16 to16Wrapper(uint value);
 	virtual uint16 readUint16Wrapper(const void *src);
 	virtual uint32 readUint32Wrapper(const void *src);
@@ -2040,7 +2039,9 @@ protected:
 
 	const OpcodeEntryPuzzlePack *_opcodesPuzzlePack;
 
+	bool _oopsValid;
 	int16 _iconToggleCount, _voiceCount;
+	uint32 _gameTime;
 	uint32 _lastTickCount, _thisTickCount;
 	uint32 _startSecondCount, _tSecondCount;
 
diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index f3c9f2eee2..0ecdce7f50 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.cpp
@@ -219,7 +219,6 @@ void AGOSEngine::animateSprites() {
 		_curSfxFile = vpe->sfxFile;
 		_windowNum = vsp->windowNum;
 		_vgaCurSpriteId = vsp->id;
-		_vgaCurSpritePriority = vsp->priority;
 
 		saveBackGround(vsp);