Skip to content

Commit

Permalink
HOPKINS: Converted iRegul to an EventMode enumeration
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreammaster
dreammaster committed Mar 31, 2013
1 parent 58971af commit 221ff31
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 88 deletions.
24 changes: 12 additions & 12 deletions engines/hopkins/anim.cpp
View file
Expand Up @@ -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)
Expand All @@ -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;
Expand All @@ -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)
Expand Down Expand Up @@ -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();
}
Expand All @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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);
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions engines/hopkins/events.cpp
View file
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions engines/hopkins/font.cpp
View file
Expand Up @@ -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++;
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/globals.cpp
View file
Expand Up @@ -83,7 +83,7 @@ Globals::Globals(HopkinsEngine *vm) {

_linuxEndDemoFl = false;
_speed = 1;
iRegul = 0;
_eventMode = EVENTMODE_DEFAULT;
_exitId = 0;
_characterSpriteBuf = 0;
_screenId = 0;
Expand Down
8 changes: 7 additions & 1 deletion engines/hopkins/globals.h
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -201,7 +207,7 @@ class Globals {
Common::String _textFilename;
byte *_levelSpriteBuf;

int iRegul;
EventMode _eventMode;

Globals(HopkinsEngine *vm);
~Globals();
Expand Down

0 comments on commit 221ff31

Please sign in to comment.