diff options
Diffstat (limited to 'engines/gnap/scenes/group5.cpp')
-rw-r--r-- | engines/gnap/scenes/group5.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/engines/gnap/scenes/group5.cpp b/engines/gnap/scenes/group5.cpp index 3ae20034fd..8cf5087ff6 100644 --- a/engines/gnap/scenes/group5.cpp +++ b/engines/gnap/scenes/group5.cpp @@ -86,13 +86,13 @@ int Scene53::pressPhoneNumberButton(int phoneNumber, int buttonNum) { _currHandSequenceId = kPlatypusHandSequenceIds[buttonNum]; } - _vm->_gnapActionStatus = 6; + _vm->_gnap->_actionStatus = 6; while (gameSys.getAnimationStatus(6) != 2) { // checkGameAppStatus(); _vm->updateMouseCursor(); _vm->gameUpdateTick(); } - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; if (buttonNum < 11) phoneNumber = buttonNum % 10 + 10 * phoneNumber; @@ -137,13 +137,13 @@ void Scene53::runRandomCall() { _callsMadeCtr = 0; } - _vm->_gnapActionStatus = 1; + _vm->_gnap->_actionStatus = 1; while (gameSys.getAnimationStatus(6) != 2) { _vm->updateMouseCursor(); // checkGameAppStatus(); _vm->gameUpdateTick(); } - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; } void Scene53::runChitChatLine() { @@ -154,13 +154,13 @@ void Scene53::runChitChatLine() { gameSys.setAnimation(0x6E, 1, 6); gameSys.insertSequence(0x6E, 1, 0, 0, kSeqNone, 16, 0, 0); - _vm->_gnapActionStatus = 1; + _vm->_gnap->_actionStatus = 1; while (gameSys.getAnimationStatus(6) != 2) { _vm->updateMouseCursor(); // checkGameAppStatus(); _vm->gameUpdateTick(); } - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; if (_vm->isFlag(kGFSpringTaken)) { gameSys.insertSequence(0x45, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0); @@ -198,7 +198,7 @@ void Scene53::runChitChatLine() { flag = 1; _vm->_isLeavingScene = true; _vm->_sceneDone = true; - _vm->_gnapActionStatus = 0; + _vm->_gnap->_actionStatus = 0; _vm->_newSceneNum = 17; break; case 5: @@ -217,31 +217,31 @@ void Scene53::runChitChatLine() { if (flag && sequenceId != -1) { _vm->stopSound(0xA0); pressPhoneNumberButton(0, _vm->_sceneClickedHotspot - 1); - _vm->_gnapActionStatus = 1; + _vm->_gnap->_actionStatus = 1; gameSys.setAnimation(sequenceId, 1, 6); gameSys.insertSequence(sequenceId, 1, 0, 0, kSeqNone, 16, 0, 0); - _vm->_gnapActionStatus = 1; + _vm->_gnap->_actionStatus = 1; while (gameSys.getAnimationStatus(6) != 2) { _vm->updateMouseCursor(); // checkGameAppStatus(); _vm->gameUpdateTick(); } - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; gameSys.setAnimation(0x72, 1, 6); gameSys.insertSequence(0x72, 1, 0, 0, kSeqNone, 16, 0, 0); - _vm->_gnapActionStatus = 1; + _vm->_gnap->_actionStatus = 1; while (gameSys.getAnimationStatus(6) != 2) { _vm->updateMouseCursor(); // checkGameAppStatus(); _vm->gameUpdateTick(); } - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; } } updateHotspots(); - _vm->_gnapActionStatus = 1; + _vm->_gnap->_actionStatus = 1; if (_vm->isFlag(kGFSpringTaken)) { gameSys.setAnimation(0x73, 40, 6); @@ -252,7 +252,7 @@ void Scene53::runChitChatLine() { _vm->gameUpdateTick(); } _currHandSequenceId = 0x73; - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; } } @@ -287,7 +287,7 @@ void Scene53::run() { switch (_vm->_sceneClickedHotspot) { case 1: - if (_vm->_gnapActionStatus < 0) { + if (_vm->_gnap->_actionStatus < 0) { _vm->runMenu(); updateHotspots(); } @@ -307,7 +307,7 @@ void Scene53::run() { phoneNumber = pressPhoneNumberButton(phoneNumber, _vm->_sceneClickedHotspot - 1); debugC(kDebugBasic, "phoneNumber: %d", phoneNumber); if (phoneNumberLen == 7) { - _vm->_gnapActionStatus = 1; + _vm->_gnap->_actionStatus = 1; if (_vm->isFlag(kGFSpringTaken)) { gameSys.setAnimation(0x73, 40, 6); gameSys.insertSequence(0x73, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0); @@ -317,7 +317,7 @@ void Scene53::run() { _vm->gameUpdateTick(); } _currHandSequenceId = 0x73; - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; } if (phoneNumber == 7284141) { runChitChatLine(); @@ -348,8 +348,8 @@ void Scene53::run() { pressPhoneNumberButton(0, _vm->_sceneClickedHotspot - 1); break; case 14: - if (_vm->_gnapActionStatus < 0) { - _vm->_gnapActionStatus = 1; + if (_vm->_gnap->_actionStatus < 0) { + _vm->_gnap->_actionStatus = 1; if (_vm->isFlag(kGFSpringTaken)) { gameSys.setAnimation(0x73, 40, 6); gameSys.insertSequence(0x73, 40, _currHandSequenceId, 40, kSeqSyncWait, 0, 0, 0); @@ -359,11 +359,11 @@ void Scene53::run() { _vm->gameUpdateTick(); } _currHandSequenceId = 0x73; - _vm->_gnapActionStatus = -1; + _vm->_gnap->_actionStatus = -1; } _vm->_isLeavingScene = true; _vm->_sceneDone = true; - _vm->_gnapActionStatus = 0; + _vm->_gnap->_actionStatus = 0; _vm->_newSceneNum = 17; } break; |