diff options
author | Strangerke | 2016-05-10 21:23:15 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-05-11 12:12:02 +0200 |
commit | 2aaebf0ae984db39a96b3fc399be952479c01d52 (patch) | |
tree | b700ed886623223b580bcd47560f9ea43261e6a0 | |
parent | b21089f81c04c83c281cfffac0dbfee9da3cc990 (diff) | |
download | scummvm-rg350-2aaebf0ae984db39a96b3fc399be952479c01d52.tar.gz scummvm-rg350-2aaebf0ae984db39a96b3fc399be952479c01d52.tar.bz2 scummvm-rg350-2aaebf0ae984db39a96b3fc399be952479c01d52.zip |
GNAP: Use enum values for _sceneClickedHotspot in scene 53
-rw-r--r-- | engines/gnap/scenes/group0.cpp | 1 | ||||
-rw-r--r-- | engines/gnap/scenes/group5.cpp | 28 |
2 files changed, 14 insertions, 15 deletions
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp index f9bc45197a..1b82faccfb 100644 --- a/engines/gnap/scenes/group0.cpp +++ b/engines/gnap/scenes/group0.cpp @@ -115,7 +115,6 @@ void Scene01::run() { _vm->updateGrabCursorSprite(0, 0); switch (_vm->_sceneClickedHotspot) { - case kHS01Device: if (gnap._actionStatus < 0) { _vm->runMenu(); diff --git a/engines/gnap/scenes/group5.cpp b/engines/gnap/scenes/group5.cpp index 3f21752e2a..2788a43ac1 100644 --- a/engines/gnap/scenes/group5.cpp +++ b/engines/gnap/scenes/group5.cpp @@ -292,22 +292,22 @@ void Scene53::run() { _vm->updateGrabCursorSprite(0, 0); switch (_vm->_sceneClickedHotspot) { - case 1: + case kHS53Device: if (gnap._actionStatus < 0) { _vm->runMenu(); updateHotspots(); } break; - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: + case kHS53PhoneKey1: + case kHS53PhoneKey2: + case kHS53PhoneKey3: + case kHS53PhoneKey4: + case kHS53PhoneKey5: + case kHS53PhoneKey6: + case kHS53PhoneKey7: + case kHS53PhoneKey8: + case kHS53PhoneKey9: + case kHS53PhoneKey0: _vm->stopSound(0xA0); ++phoneNumberLen; phoneNumber = pressPhoneNumberButton(phoneNumber, _vm->_sceneClickedHotspot - 1); @@ -349,11 +349,11 @@ void Scene53::run() { } } break; - case 12: - case 13: + case kHS53PhoneKeySharp: + case kHS53PhoneKeyStar: pressPhoneNumberButton(0, _vm->_sceneClickedHotspot - 1); break; - case 14: + case kHS53PhoneExit: if (gnap._actionStatus < 0) { gnap._actionStatus = 1; if (_vm->isFlag(kGFSpringTaken)) { |