From 013522457ca3fd84d4c9575d9bc20b6a875b09a3 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 13 Feb 2014 08:44:06 +0100 Subject: VOYEUR: Remove useless fields in Events, some renaming --- engines/voyeur/events.cpp | 23 +++-------------------- engines/voyeur/events.h | 10 ++-------- engines/voyeur/files_threads.cpp | 12 ++++-------- engines/voyeur/graphics.cpp | 6 ------ engines/voyeur/voyeur.cpp | 4 ---- engines/voyeur/voyeur_game.cpp | 17 +++++------------ 6 files changed, 14 insertions(+), 58 deletions(-) (limited to 'engines/voyeur') diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 198d00438c..3b761e899e 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -50,16 +50,10 @@ IntNode::IntNode(uint16 curTime, uint16 timeReset, uint16 flags) { IntData::IntData() { _flipWait = false; _hasPalette = false; - field16 = 0; - field1A = 0; - field1E = 0; - field22 = 0; - field24 = 0; + _flashTimer = 0; + _flashStep = 0; field26 = 0; - field2A = 0; - _palChanged = false; _skipFading = false; - field3D = false; _palStartIndex = 0; _palEndIndex = 0; _palette = NULL; @@ -193,16 +187,10 @@ void EventsManager::showMousePosition() { } void EventsManager::voyeurTimer() { - _gameData.field22 += _gameData.field24; - _gameData.field1A += _gameData.field1E; - // _gameData.field1C += _gameData._timerFn; *** WHY INC field by a function pointer?! - - _gameData.field16 = 0; - _gameData.field3D = true; + _gameData._flashTimer += _gameData._flashStep; if (--_gameData.field26 <= 0) { if (_gameData._flipWait) { - _gameData._palChanged = true; _gameData._flipWait = false; _gameData._skipFading = false; } @@ -366,8 +354,6 @@ void EventsManager::startFade(CMapResource *cMap) { _intPtr._palEndIndex = _fadeLastCol; _intPtr._hasPalette = true; - if (!(cMap->_fadeStatus & 2)) - _intPtr._palChanged = true; } if (_cycleStatus & 1) @@ -417,7 +403,6 @@ void EventsManager::vDoFadeInt() { _intPtr._palEndIndex = _fadeLastCol; _intPtr._hasPalette = true; - _intPtr._palChanged = true; } void EventsManager::vDoCycleInt() { @@ -497,7 +482,6 @@ void EventsManager::vDoCycleInt() { } _intPtr._hasPalette = true; - _intPtr._palChanged = true; } } } @@ -619,7 +603,6 @@ void EventsManager::startCursorBlink() { if (_vm->_voy._eventFlags & EVTFLAG_RECORDING) { _vm->_graphicsManager.setOneColor(128, 55, 5, 5); _vm->_graphicsManager.setColor(128, 220, 20, 20); - _intPtr._palChanged = true; _intPtr._hasPalette = true; _vm->_graphicsManager.drawDot(); diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h index bd62b5c8c2..6167a89915 100644 --- a/engines/voyeur/events.h +++ b/engines/voyeur/events.h @@ -53,17 +53,11 @@ public: class IntData { public: bool _flipWait; - int field16; // CHECKME: Useless variable - int field1A; - int field1E; - int field22; // CHECKME: Useless variable - int field24; // CHECKME: Useless variable + int _flashTimer; + int _flashStep; int field26; - int field2A; // CHECKME: Useless variable bool _hasPalette; - bool _palChanged; // CHECKME: Useless variable bool _skipFading; - bool field3D; // CHECKME: Useless variable int _palStartIndex; int _palEndIndex; byte *_palette; diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 897bfae1b6..5989c92439 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -1000,7 +1000,6 @@ int ThreadResource::doApt() { _vm->_graphicsManager.setColor(131, 215, 215, 215); _vm->_graphicsManager.setColor(132, 235, 235, 235); - _vm->_eventsManager._intPtr._palChanged = true; _vm->_eventsManager._intPtr._hasPalette = true; // Main loop to allow users to move the cursor and select hotspots @@ -1150,7 +1149,6 @@ void ThreadResource::doRoom() { while (!vm.shouldQuit() && !breakFlag) { _vm->_voyeurArea = AREA_ROOM; vm._graphicsManager.setColor(128, 0, 255, 0); - vm._eventsManager._intPtr._palChanged = true; vm._eventsManager._intPtr._hasPalette = true; do { @@ -1190,7 +1188,6 @@ void ThreadResource::doRoom() { vm._eventsManager.setCursor(magnifierCursor); } - vm._eventsManager._intPtr._palChanged = true; vm._eventsManager._intPtr._hasPalette = true; vm._graphicsManager.flipPage(); vm._eventsManager.sWaitFlip(); @@ -1314,8 +1311,8 @@ int ThreadResource::doInterface() { _vm->_voy._eventFlags &= ~EVTFLAG_100; _vm->_playStampGroupId = -1; - _vm->_eventsManager._intPtr.field1E = 1; - _vm->_eventsManager._intPtr.field1A = 0; + _vm->_eventsManager._intPtr._flashStep = 1; + _vm->_eventsManager._intPtr._flashTimer = 0; if (_vm->_voy._RTVNum >= _vm->_voy._RTVLimit || _vm->_voy._RTVNum < 0) _vm->_voy._RTVNum = _vm->_voy._RTVLimit - 1; @@ -1354,7 +1351,6 @@ int ThreadResource::doInterface() { _vm->_eventsManager.getMouseInfo(); _vm->_graphicsManager.setColor(240, 220, 220, 220); - _vm->_eventsManager._intPtr._palChanged = true; _vm->_eventsManager._intPtr._hasPalette = true; _vm->_voy._eventFlags &= ~EVTFLAG_TIME_DISABLED; @@ -1475,8 +1471,8 @@ int ThreadResource::doInterface() { _vm->_eventsManager.getMouseInfo(); _vm->_voy._eventFlags &= ~EVTFLAG_TIME_DISABLED; - _vm->_eventsManager._intPtr.field1E = 1; - _vm->_eventsManager._intPtr.field1A = 0; + _vm->_eventsManager._intPtr._flashStep = 1; + _vm->_eventsManager._intPtr._flashTimer = 0; } } } while (!_vm->_eventsManager._rightClick && !_vm->shouldQuit() && diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp index 0deeaa1e45..975e070d61 100644 --- a/engines/voyeur/graphics.cpp +++ b/engines/voyeur/graphics.cpp @@ -892,10 +892,6 @@ void GraphicsManager::fillPic(DisplayResource *display, byte onOff) { * Queues the given picture for display */ void GraphicsManager::sDisplayPic(PictureResource *pic) { - if (pic->_flags & DISPFLAG_8) { - _vm->_eventsManager._intPtr.field2A = READ_LE_UINT32(pic->_imgData) >> _sImageShift; - } - _vm->_eventsManager._intPtr._flipWait = true; } @@ -974,7 +970,6 @@ void GraphicsManager::resetPalette() { for (int i = 0; i < 256; ++i) setColor(i, 0, 0, 0); - _vm->_eventsManager._intPtr._palChanged = true; _vm->_eventsManager._intPtr._hasPalette = true; } @@ -1004,7 +999,6 @@ void GraphicsManager::setColors(int start, int count, const byte *pal) { } } - _vm->_eventsManager._intPtr._palChanged = true; _vm->_eventsManager._intPtr._hasPalette = true; } diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp index 911daa0e2b..f2822b4c7c 100644 --- a/engines/voyeur/voyeur.cpp +++ b/engines/voyeur/voyeur.cpp @@ -263,7 +263,6 @@ bool VoyeurEngine::doLock() { _eventsManager.setCursor(cursorPic); _eventsManager.showCursor(); - _eventsManager._intPtr. _palChanged = true; _eventsManager._intPtr._hasPalette = true; _graphicsManager._fontPtr->_curFont = _bVoy->boltEntry(0x708)._fontResource; @@ -315,7 +314,6 @@ bool VoyeurEngine::doLock() { } _eventsManager.setCursorColor(127, (key == -1) ? 0 : 1); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; _eventsManager.delay(1); @@ -459,7 +457,6 @@ void VoyeurEngine::doOpening() { for (int i = 0; i < 256; ++i) _graphicsManager.setColor(i, 8, 8, 8); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; (*_graphicsManager._vPort)->setupViewPort(); flipPageAndWait(); @@ -637,7 +634,6 @@ void VoyeurEngine::playAudio(int audioId) { void VoyeurEngine::doTransitionCard(const Common::String &time, const Common::String &location) { _graphicsManager.setColor(128, 16, 16, 16); _graphicsManager.setColor(224, 220, 220, 220); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; (*_graphicsManager._vPort)->setupViewPort(NULL); diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index 7bb10c2f36..c4c52bd799 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -286,7 +286,6 @@ void VoyeurEngine::doClosingCredits() { (*_graphicsManager._vPort)->setupViewPort(NULL); _graphicsManager.setColor(1, 180, 180, 180); _graphicsManager.setColor(2, 200, 200, 200); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; _graphicsManager._fontPtr->_curFont = _bVoy->boltEntry(0x402)._fontResource; @@ -390,7 +389,6 @@ void VoyeurEngine::doPiracy() { _graphicsManager.screenReset(); _graphicsManager.setColor(1, 0, 0, 0); _graphicsManager.setColor(2, 255, 255, 255); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; (*_graphicsManager._vPort)->setupViewPort(NULL); (*_graphicsManager._vPort)->fillPic(1); @@ -460,7 +458,6 @@ void VoyeurEngine::reviewTape() { _graphicsManager.setColor(12, 120, 248, 120); _eventsManager.setCursorColor(128, 1); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; _graphicsManager._fontPtr->_curFont = _bVoy->boltEntry(0x909)._fontResource; _graphicsManager._fontPtr->_fontSaveBack = false; @@ -591,7 +588,6 @@ void VoyeurEngine::reviewTape() { _eventsManager.setCursorColor(128, (foundIndex == -1) ? 0 : 1); } - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; if (_eventsManager._mouseClicked || _eventsManager._mouseUnk) { @@ -688,8 +684,8 @@ void VoyeurEngine::reviewTape() { _graphicsManager._backColors->startFade(); flipPageAndWaitForFade(); - _eventsManager._intPtr.field1E = 1; - _eventsManager._intPtr.field1A = 0; + _eventsManager._intPtr._flashStep = 1; + _eventsManager._intPtr._flashTimer = 0; _voy._eventFlags &= ~EVTFLAG_TIME_DISABLED; // Play suond for the given duration @@ -1033,7 +1029,6 @@ void VoyeurEngine::makeViewFinder() { _graphicsManager.setColor(243, 105, 105, 105); _graphicsManager.setColor(palOffset + 241, 219, 235, 235); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; } @@ -1293,7 +1288,6 @@ void VoyeurEngine::doTimeBar(bool force) { (*_graphicsManager._vPort)->sFillBox(6, fullHeight - 92); if (height > 0) { _graphicsManager.setColor(215, 238, 238, 238); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; _graphicsManager._drawPtr->_penColor = 215; @@ -1305,17 +1299,16 @@ void VoyeurEngine::doTimeBar(bool force) { void VoyeurEngine::flashTimeBar(){ if (_voy._RTVNum >= 0 && (_voy._RTVLimit - _voy._RTVNum) < 11 && - (_eventsManager._intPtr.field1A >= (_flashTimeVal + 15) || - _eventsManager._intPtr.field1A < _flashTimeVal)) { + (_eventsManager._intPtr._flashTimer >= (_flashTimeVal + 15) || + _eventsManager._intPtr._flashTimer < _flashTimeVal)) { // Within camera low power range - _flashTimeVal = _eventsManager._intPtr.field1A; + _flashTimeVal = _eventsManager._intPtr._flashTimer; if (_flashTimeFlag) _graphicsManager.setColor(240, 220, 20, 20); else _graphicsManager.setColor(240, 220, 220, 220); - _eventsManager._intPtr._palChanged = true; _eventsManager._intPtr._hasPalette = true; _flashTimeFlag = !_flashTimeFlag; } -- cgit v1.2.3