From 221ff31fee0c0b13f780f436048f43ae4b50e83a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 31 Mar 2013 10:47:46 -0400 Subject: HOPKINS: Converted iRegul to an EventMode enumeration --- engines/hopkins/anim.cpp | 24 ++++----- engines/hopkins/events.cpp | 4 +- engines/hopkins/font.cpp | 6 +-- engines/hopkins/globals.cpp | 2 +- engines/hopkins/globals.h | 8 ++- engines/hopkins/hopkins.cpp | 120 ++++++++++++++++++++++---------------------- engines/hopkins/objects.cpp | 18 +++---- 7 files changed, 94 insertions(+), 88 deletions(-) (limited to 'engines') diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index 75f6c26215..1263f6281b 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -103,7 +103,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui _vm->_eventsManager->_escKeyFl = false; _vm->_soundManager->loadAnimSound(); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { // Do pre-animation delay do { if (_vm->_eventsManager->_escKeyFl) @@ -130,7 +130,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { do { if (_vm->_eventsManager->_escKeyFl) break; @@ -154,7 +154,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui } } - if (_vm->_globals->iRegul == 1 && !_vm->_eventsManager->_escKeyFl) { + if (_vm->_globals->_eventMode == 1 && !_vm->_eventsManager->_escKeyFl) { // Do post-animation delay do { if (_vm->_eventsManager->_escKeyFl) @@ -261,7 +261,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u _vm->_eventsManager->_rateCounter = 0; _vm->_eventsManager->_escKeyFl = false; _vm->_soundManager->loadAnimSound(); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { while (!_vm->_eventsManager->_escKeyFl && _vm->_eventsManager->_rateCounter < rate1) { _vm->_eventsManager->refreshEvents(); } @@ -286,7 +286,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u break; f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { while (!_vm->_eventsManager->_escKeyFl && _vm->_eventsManager->_rateCounter < rate2) { _vm->_eventsManager->refreshEvents(); _vm->_soundManager->checkSoundEnd(); @@ -305,7 +305,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u _vm->_soundManager->checkSoundEnd(); } - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { while (!_vm->_eventsManager->_escKeyFl && _vm->_eventsManager->_rateCounter < rate3) { _vm->_eventsManager->refreshEvents(); _vm->_soundManager->checkSoundEnd(); @@ -616,7 +616,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui _vm->_eventsManager->_rateCounter = 0; _vm->_eventsManager->_escKeyFl = false; _vm->_soundManager->loadAnimSound(); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { do { if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) { skipFl = true; @@ -643,7 +643,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui break; f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { do { if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) { skipFl = true; @@ -671,7 +671,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui } } - if (_vm->_globals->iRegul == 1 && !skipFl) { + if (_vm->_globals->_eventMode == 1 && !skipFl) { do { if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) { skipFl = true; @@ -737,7 +737,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u _vm->_eventsManager->_rateCounter = 0; _vm->_eventsManager->_escKeyFl = false; _vm->_soundManager->loadAnimSound(); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { do { _vm->_eventsManager->refreshEvents(); _vm->_soundManager->checkSoundEnd(); @@ -761,7 +761,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u break; f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { do { _vm->_eventsManager->refreshEvents(); } while (!_vm->shouldQuit() && !_vm->_eventsManager->_escKeyFl && _vm->_eventsManager->_rateCounter < rate2); @@ -779,7 +779,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u } } - if (_vm->_globals->iRegul == 1) { + if (_vm->_globals->_eventMode == 1) { // Wait for third rate delay do { _vm->_eventsManager->refreshEvents(); diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index 6a55001792..898b68dbe0 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -423,7 +423,7 @@ void EventsManager::refreshScreenAndEvents() { pollEvents(); bool innerLoopFl = false; - while (!_vm->shouldQuit() && (_breakoutFl || _vm->_globals->iRegul != 1)) { + while (!_vm->shouldQuit() && (_breakoutFl || _vm->_globals->_eventMode != EVENTMODE_IGNORE)) { pollEvents(); if (!_breakoutFl) { @@ -444,7 +444,7 @@ void EventsManager::refreshScreenAndEvents() { } if (externalLoopFl) break; - } while (!_vm->shouldQuit() && _vm->_globals->iRegul == 3 && _rateCounter <= 15); + } while (!_vm->shouldQuit() && _vm->_globals->_eventMode == 3 && _rateCounter <= 15); _vm->_globals->_speed = 2; _rateCounter = 0; if (!_vm->_graphicsManager->_largeScreenFl || _vm->_graphicsManager->_scrollStatus == 1) { diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp index 02f1caf439..8bd045448c 100644 --- a/engines/hopkins/font.cpp +++ b/engines/hopkins/font.cpp @@ -480,12 +480,12 @@ void FontManager::renderTextDisplay(int xp, int yp, const Common::String &msg, i charEndPosX += charWidth; _vm->_graphicsManager->addDirtyRect(charStartPosX, yp, charEndPosX, yp + 12); if (_vm->_eventsManager->_escKeyFl) { - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; _vm->_eventsManager->refreshScreenAndEvents(); } else { - _vm->_globals->iRegul = 4; + _vm->_globals->_eventMode = EVENTMODE_ALT; _vm->_eventsManager->refreshScreenAndEvents(); - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; } } curChar = *srcP++; diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index c63c875710..4dc1df780e 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -83,7 +83,7 @@ Globals::Globals(HopkinsEngine *vm) { _linuxEndDemoFl = false; _speed = 1; - iRegul = 0; + _eventMode = EVENTMODE_DEFAULT; _exitId = 0; _characterSpriteBuf = 0; _screenId = 0; diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index 19845c7859..71bc3f0ab4 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -141,6 +141,12 @@ enum Directions { DIR_UP_LEFT = 8 }; +enum EventMode { + EVENTMODE_DEFAULT = 0, + EVENTMODE_IGNORE = 1, + EVENTMODE_CREDITS = 3, + EVENTMODE_ALT = 4 +}; class HopkinsEngine; @@ -201,7 +207,7 @@ public: Common::String _textFilename; byte *_levelSpriteBuf; - int iRegul; + EventMode _eventMode; Globals(HopkinsEngine *vm); ~Globals(); diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 882efa2cec..f78f0a8d93 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -138,7 +138,7 @@ bool HopkinsEngine::runWin95Demo() { _objectsManager->addObject(14); _objectsManager->_helicopterFl = false; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -154,7 +154,7 @@ bool HopkinsEngine::runWin95Demo() { } _eventsManager->_rateCounter = 0; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _globals->_speed = 1; for (int i = 1; i < 50; i++) { @@ -162,7 +162,7 @@ bool HopkinsEngine::runWin95Demo() { _eventsManager->refreshScreenAndEvents(); } - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; if (_eventsManager->_rateCounter > 475) _globals->_speed = 2; if (_eventsManager->_rateCounter > 700) @@ -170,7 +170,7 @@ bool HopkinsEngine::runWin95Demo() { if (_startGameSlot == -1) { _graphicsManager->fadeOutLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _globals->_characterSpriteBuf = _fileManager->loadFile("PERSO.SPR"); } @@ -227,7 +227,7 @@ bool HopkinsEngine::runWin95Demo() { _graphicsManager->fadeInLong(); _eventsManager->delay(500); _graphicsManager->fadeOutLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->_specialSoundNum = 2; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -401,19 +401,19 @@ bool HopkinsEngine::runWin95Demo() { case 150: _soundManager->playSound(28); - _globals->iRegul = 4; // CHECKME! + _globals->_eventMode = EVENTMODE_ALT; // CHECKME! _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); _graphicsManager->clearPalette(); _animationManager->playAnim("JOUR1A.anm", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; case 151: _soundManager->playSound(28); - _globals->iRegul = 4; // CHECKME! + _globals->_eventMode = EVENTMODE_ALT; // CHECKME! _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); @@ -423,18 +423,18 @@ bool HopkinsEngine::runWin95Demo() { _eventsManager->delay(5000); _graphicsManager->fadeOutLong(); _globals->_exitId = 300; - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; break; case 152: _soundManager->playSound(28); - _globals->iRegul = 4; // CHECKME! + _globals->_eventMode = EVENTMODE_ALT; // CHECKME! _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); _graphicsManager->clearPalette(); _animationManager->playAnim("JOUR4A.anm", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; } @@ -469,7 +469,7 @@ bool HopkinsEngine::runLinuxDemo() { playIntro(); } - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_characterSpriteBuf = _fileManager->loadFile("PERSO.SPR"); _globals->_characterType = 0; _objectsManager->_mapCarPosX = _objectsManager->_mapCarPosY = 0; @@ -539,7 +539,7 @@ bool HopkinsEngine::runLinuxDemo() { _graphicsManager->fadeInLong(); _eventsManager->delay(500); _graphicsManager->fadeOutLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->_specialSoundNum = 2; _graphicsManager->lockScreen(); @@ -726,7 +726,7 @@ bool HopkinsEngine::runLinuxDemo() { case 150: _soundManager->playSound(16); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -734,13 +734,13 @@ bool HopkinsEngine::runLinuxDemo() { _graphicsManager->clearPalette(); _graphicsManager->_fadingFl = true; _animationManager->playAnim("JOUR1A.anm", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; case 151: _soundManager->playSound(16); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -748,13 +748,13 @@ bool HopkinsEngine::runLinuxDemo() { _graphicsManager->clearPalette(); _graphicsManager->_fadingFl = true; _animationManager->playAnim("JOUR3A.anm", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; case 152: _soundManager->playSound(16); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -762,7 +762,7 @@ bool HopkinsEngine::runLinuxDemo() { _graphicsManager->clearPalette(); _graphicsManager->_fadingFl = true; _animationManager->playAnim("JOUR4A.anm", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; } @@ -785,7 +785,7 @@ bool HopkinsEngine::runFull() { // in my copy: it mentions a Win95 version v4 using DirectDraw (Strangerke) } else if (getPlatform() == Common::kPlatformWindows) { _objectsManager->_helicopterFl = false; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; // This code displays the game version. // It wasn't present in the original and could be put in the debugger // It has been added there for debug purposes @@ -807,7 +807,7 @@ bool HopkinsEngine::runFull() { } _graphicsManager->clearVesaScreen(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; } _graphicsManager->lockScreen(); @@ -822,7 +822,7 @@ bool HopkinsEngine::runFull() { _eventsManager->delay(500); _graphicsManager->fadeOutLong(); _globals->_speed = 2; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->_fadingFl = true; _animationManager->playAnim("MP.ANM", 10, 16, 200); } else { @@ -843,7 +843,7 @@ bool HopkinsEngine::runFull() { _eventsManager->delay(500); _graphicsManager->fadeOutLong(); } - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_characterSpriteBuf = _fileManager->loadFile("PERSO.SPR"); _globals->_characterType = 0; _objectsManager->_mapCarPosX = _objectsManager->_mapCarPosY = 0; @@ -895,7 +895,7 @@ bool HopkinsEngine::runFull() { _graphicsManager->fadeInLong(); _eventsManager->delay(500); _graphicsManager->fadeOutLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->_specialSoundNum = 2; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -1031,7 +1031,7 @@ bool HopkinsEngine::runFull() { else if (!_globals->_saveData->_data[svHutBurningFl]) _objectsManager->PERSONAGE2("IM17", "IM17", "ANIM17", "IM17", 11, true); if (_globals->_exitId == 18) { - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); @@ -1050,7 +1050,7 @@ bool HopkinsEngine::runFull() { _animationManager->playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager->fadeOutShort(); } - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; } break; @@ -1077,7 +1077,7 @@ bool HopkinsEngine::runFull() { _globals->_characterMaxPosY = 440; _objectsManager->PERSONAGE2("IM20", "IM20", "ANIM20", "IM20", 6, true); if (_globals->_exitId == 17) { - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->stopSound(); _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -1089,7 +1089,7 @@ bool HopkinsEngine::runFull() { _animationManager->playAnim("PURG2A.ANM", 12, 18, 50); if (getPlatform() != Common::kPlatformLinux) _graphicsManager->fadeOutShort(); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; } break; @@ -1443,7 +1443,7 @@ bool HopkinsEngine::runFull() { _globals->_characterMaxPosY = 435; _objectsManager->PERSONAGE2("IM97", "IM97", "ANIM97", "IM97", 19, false); if (_globals->_exitId == 18) { - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->stopSound(); _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -1452,7 +1452,7 @@ bool HopkinsEngine::runFull() { _soundManager->playSound(6); _animationManager->playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager->fadeOutShort(); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; } break; @@ -1523,7 +1523,7 @@ bool HopkinsEngine::runFull() { case 150: _soundManager->playSound(16); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); @@ -1531,13 +1531,13 @@ bool HopkinsEngine::runFull() { if (getPlatform() == Common::kPlatformLinux) _graphicsManager->_fadingFl = true; _animationManager->playAnim("JOUR1A.ANM", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; case 151: _soundManager->playSound(16); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); @@ -1545,13 +1545,13 @@ bool HopkinsEngine::runFull() { if (getPlatform() == Common::kPlatformLinux) _graphicsManager->_fadingFl = true; _animationManager->playAnim("JOUR3A.ANM", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; case 152: _soundManager->playSound(16); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); @@ -1559,7 +1559,7 @@ bool HopkinsEngine::runFull() { if (getPlatform() == Common::kPlatformLinux) _graphicsManager->_fadingFl = true; _animationManager->playAnim("JOUR4A.ANM", 12, 12, 2000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; break; @@ -1570,7 +1570,7 @@ bool HopkinsEngine::runFull() { case 198: case 199: _globals->_characterSpriteBuf = _globals->freeMemory(_globals->_characterSpriteBuf); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->stopSound(); _soundManager->playSound(23); _globals->_exitId = handleBaseMap(); // Handles the base map (non-Windows) @@ -1578,7 +1578,7 @@ bool HopkinsEngine::runFull() { _soundManager->stopSound(); _globals->_characterSpriteBuf = _fileManager->loadFile("PERSO.SPR"); _globals->_characterType = 0; - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _graphicsManager->_lineNbr = SCREEN_WIDTH; break; } @@ -1649,7 +1649,7 @@ void HopkinsEngine::playIntro() { memset(&paletteData, 0, PALETTE_EXT_BLOCK_SIZE); _eventsManager->refreshScreenAndEvents(); _eventsManager->_mouseFl = false; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _eventsManager->refreshScreenAndEvents(); _soundManager->playSound(16); _animationManager->setClearAnimFlag(); @@ -1686,7 +1686,7 @@ void HopkinsEngine::playIntro() { for (int i = 0; i <= 4; i++) _eventsManager->refreshScreenAndEvents(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->fadeInLong(); if (_graphicsManager->_largeScreenFl) { _graphicsManager->_scrollStatus = 2; @@ -1731,7 +1731,7 @@ void HopkinsEngine::playIntro() { for (int i = 0; i <= 4; i++) _eventsManager->refreshScreenAndEvents(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->fadeInLong(); for (uint i = 0; i < 200 / _globals->_speed; ++i) _eventsManager->refreshScreenAndEvents(); @@ -1773,7 +1773,7 @@ void HopkinsEngine::playIntro() { for (int i = 0; i <= 3; i++) _eventsManager->refreshScreenAndEvents(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->setPaletteVGA256WithRefresh(paletteData2, _graphicsManager->_frontBuffer); int introIndex = 0; @@ -1910,7 +1910,7 @@ void HopkinsEngine::bombExplosion() { _graphicsManager->unlockScreen(); _graphicsManager->clearPalette(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->_specialSoundNum = 199; _graphicsManager->_fadingFl = true; _animationManager->playAnim("BOMBE2A.ANM", 50, 14, 500); @@ -1942,7 +1942,7 @@ void HopkinsEngine::bombExplosion() { _graphicsManager->fadeOutLong(); _graphicsManager->endDisplayBob(); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 151; } @@ -1982,7 +1982,7 @@ void HopkinsEngine::endLinuxDemo() { void HopkinsEngine::handleConflagration() { _globals->_disableInventFl = true; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->loadImage("IM71"); _animationManager->loadAnim("ANIM71"); _graphicsManager->SETCOLOR3(252, 100, 100, 100); @@ -1995,7 +1995,7 @@ void HopkinsEngine::handleConflagration() { _eventsManager->refreshScreenAndEvents(); _graphicsManager->fadeInLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; for (int cpt = 0; cpt <= 249; cpt++) _eventsManager->refreshScreenAndEvents(); @@ -2014,7 +2014,7 @@ void HopkinsEngine::handleConflagration() { } void HopkinsEngine::playSubmarineCutscene() { - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->_lineNbr = SCREEN_WIDTH; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); @@ -2060,7 +2060,7 @@ void HopkinsEngine::playUnderwaterBaseCutscene() { _graphicsManager->unlockScreen(); _graphicsManager->clearPalette(); _soundManager->playSound(26); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _globals->_disableInventFl = true; _graphicsManager->_fadingFl = true; _animationManager->playSequence("abase.seq", 50, 15, 50, false, false, true); @@ -2085,7 +2085,7 @@ void HopkinsEngine::playUnderwaterBaseCutscene() { _objectsManager->resetHidingItems(); _globals->_disableInventFl = false; _globals->_exitId = 93; - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; } } @@ -2095,7 +2095,7 @@ void HopkinsEngine::playEnding() { _globals->_disableInventFl = true; _graphicsManager->_scrollOffset = 0; _globals->_cityMapEnabledFl = false; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->playSound(26); _linesManager->_route = (RouteItem *)g_PTRNUL; _globals->_freezeCharacterFl = true; @@ -2118,7 +2118,7 @@ void HopkinsEngine::playEnding() { _eventsManager->refreshScreenAndEvents(); _graphicsManager->fadeInLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; do _eventsManager->refreshScreenAndEvents(); @@ -2184,7 +2184,7 @@ void HopkinsEngine::playEnding() { } _eventsManager->_escKeyFl = false; _graphicsManager->fadeOutLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->_specialSoundNum = 0; _graphicsManager->_fadingFl = true; _animationManager->playAnim("JOUR2A.anm", 12, 12, 1000); @@ -2199,7 +2199,7 @@ void HopkinsEngine::playEnding() { _animationManager->playAnim("FF1a.anm", 9, 18, 9); _animationManager->playAnim("FF2a.anm", 24, 24, 100); displayCredits(); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; _dialogsManager->enableInvent(); _globals->_disableInventFl = false; @@ -2227,22 +2227,22 @@ void HopkinsEngine::playEnding() { _graphicsManager->endDisplayBob(); _soundManager->removeSample(1); _soundManager->playSound(16); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _soundManager->_specialSoundNum = 0; _dialogsManager->enableInvent(); _globals->_disableInventFl = false; _animationManager->playAnim("JOUR4A.anm", 12, 12, 1000); - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; _globals->_exitId = 300; } _globals->_characterSpriteBuf = _fileManager->loadFile("PERSO.SPR"); _globals->_characterType = 0; - _globals->iRegul = 0; + _globals->_eventMode = EVENTMODE_DEFAULT; } void HopkinsEngine::playPlaneCutscene() { _soundManager->playSound(28); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _graphicsManager->lockScreen(); _graphicsManager->clearScreen(); _graphicsManager->unlockScreen(); @@ -2504,7 +2504,7 @@ void HopkinsEngine::displayCredits() { _graphicsManager->fadeInLong(); _soundManager->playSound(28); _eventsManager->_mouseFl = false; - _globals->iRegul = 3; + _globals->_eventMode = EVENTMODE_CREDITS; _globals->_creditsStartX = _globals->_creditsEndX = _globals->_creditsStartY = _globals->_creditsEndY = -1; int soundId = 28; do { @@ -2555,7 +2555,7 @@ void HopkinsEngine::displayCredits() { _globals->_creditsEndY = -1; } while ((_eventsManager->getMouseButton() != 1) && (!shouldQuit())); _graphicsManager->fadeOutLong(); - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; _eventsManager->_mouseFl = true; } @@ -2840,7 +2840,7 @@ void HopkinsEngine::handleOceanMaze(int16 curExitId, Common::String backgroundFi if (!_graphicsManager->_noFadingFl) _graphicsManager->fadeInLong(); _graphicsManager->_noFadingFl = false; - _globals->iRegul = 1; + _globals->_eventMode = EVENTMODE_IGNORE; for (;;) { int mouseButton = _eventsManager->getMouseButton(); diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index cd372b7e06..734d44da4c 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -1799,7 +1799,7 @@ void ObjectsManager::handleCityMap() { _vm->_globals->_exitId = 0; _vm->_globals->_checkDistanceFl = true; _vm->_soundManager->playSound(31); - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; _vm->_graphicsManager->loadImage("PLAN"); _vm->_linesManager->loadLines("PLAN.OB2"); loadHidingItems("PLAN.CA2"); @@ -1833,7 +1833,7 @@ void ObjectsManager::handleCityMap() { for (int i = 0; i <= 4; i++) _vm->_eventsManager->refreshScreenAndEvents(); - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; _vm->_graphicsManager->fadeInLong(); _vm->_eventsManager->changeMouseCursor(4); _vm->_graphicsManager->_noFadingFl = false; @@ -1876,7 +1876,7 @@ void ObjectsManager::handleCityMap() { if (!_vm->_graphicsManager->_noFadingFl) _vm->_graphicsManager->fadeOutLong(); - _vm->_globals->iRegul = 0; + _vm->_globals->_eventMode = EVENTMODE_DEFAULT; _vm->_graphicsManager->_noFadingFl = false; _mapCarPosX = getSpriteX(0); _mapCarPosY = getSpriteY(0); @@ -3306,7 +3306,7 @@ void ObjectsManager::sceneSpecialIni() { for (int i = 0; i <= 4; i++) _vm->_eventsManager->refreshScreenAndEvents(); _vm->_graphicsManager->fadeInLong(); - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; _vm->_globals->_disableInventFl = false; _vm->_graphicsManager->_noFadingFl = true; _vm->_globals->_introSpeechOffFl = true; @@ -3727,7 +3727,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo _vm->_dialogsManager->enableInvent(); _vm->_graphicsManager->_scrollOffset = 0; _vm->_globals->_cityMapEnabledFl = false; - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; _vm->_soundManager->playSound(soundNum); _vm->_linesManager->_route = (RouteItem *)g_PTRNUL; _vm->_globals->_freezeCharacterFl = true; @@ -3802,7 +3802,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo if (_vm->_globals->_screenId == 61) removeSprite(0); clearScreen(); - _vm->_globals->iRegul = 0; + _vm->_globals->_eventMode = EVENTMODE_DEFAULT; } /** @@ -3821,7 +3821,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm _vm->_globals->_exitId = 0; _vm->_globals->_checkDistanceFl = true; _vm->_soundManager->playSound(soundNum); - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; if (!backgroundFile.empty()) _vm->_graphicsManager->loadImage(backgroundFile); if (!linkFile.empty()) @@ -3887,7 +3887,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm for (int idx = 0; idx < 5; ++idx) _vm->_eventsManager->refreshScreenAndEvents(); - _vm->_globals->iRegul = 1; + _vm->_globals->_eventMode = EVENTMODE_IGNORE; if (!_vm->_graphicsManager->_noFadingFl) _vm->_graphicsManager->fadeInLong(); _vm->_graphicsManager->_noFadingFl = false; @@ -3950,7 +3950,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm } else { _helicopterFl = false; } - _vm->_globals->iRegul = 0; + _vm->_globals->_eventMode = EVENTMODE_DEFAULT; } void ObjectsManager::setVerb(int id) { -- cgit v1.2.3