diff options
author | Strangerke | 2014-01-27 07:53:34 +0100 |
---|---|---|
committer | Strangerke | 2014-01-27 07:54:50 +0100 |
commit | 3a236181c47db06f5e5f82391133b29fefeefaca (patch) | |
tree | a88e516ff850763b9834f71836342d70ffb6ffe5 | |
parent | f92df4c6aab9ffb06ed241ae22779bdf11dc540c (diff) | |
download | scummvm-rg350-3a236181c47db06f5e5f82391133b29fefeefaca.tar.gz scummvm-rg350-3a236181c47db06f5e5f82391133b29fefeefaca.tar.bz2 scummvm-rg350-3a236181c47db06f5e5f82391133b29fefeefaca.zip |
TSAGE: Get rid of some magic values
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_dialogs.cpp | 6 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 12 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp index eb15585247..708a3ccb45 100644 --- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp +++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp @@ -203,13 +203,13 @@ void CharacterDialog::show() { GfxButton *btn = NULL; int oldCharacter = R2_GLOBALS._player._characterIndex; switch (oldCharacter) { - case 1: + case R2_QUINN: btn = &dlg->_btnQuinn; break; - case 2: + case R2_SEEKER: btn = &dlg->_btnSeeker; break; - case 3: + case R2_MIRANDA: btn = &dlg->_btnMiranda; break; default: diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 3fd728ce5b..2fbce0646c 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -2993,7 +2993,7 @@ void Scene300::Action4::signal() { bool Scene300::QuinnWorkstation::startAction(CursorType action, Event &event) { switch (action) { case CURSOR_USE: - if (R2_GLOBALS._player._characterIndex != 1) + if (R2_GLOBALS._player._characterIndex != R2_QUINN) SceneItem::display2(300, 46); else if (R2_GLOBALS.getFlag(44)) { R2_GLOBALS._player.setAction(NULL); @@ -3024,7 +3024,7 @@ bool Scene300::QuinnWorkstation::startAction(CursorType action, Event &event) { bool Scene300::MirandaWorkstation::startAction(CursorType action, Event &event) { switch (action) { case CURSOR_USE: - if (R2_GLOBALS._player._characterIndex != 3) + if (R2_GLOBALS._player._characterIndex != R2_MIRANDA) SceneItem::display2(300, 49); else R2_GLOBALS._sceneManager.changeScene(325); @@ -3054,7 +3054,7 @@ bool Scene300::SeekerWorkstation::startAction(CursorType action, Event &event) { break; case CURSOR_USE: - if (R2_GLOBALS._player._characterIndex != 2) + if (R2_GLOBALS._player._characterIndex != R2_SEEKER) SceneItem::display2(300, 48); else R2_GLOBALS._sceneManager.changeScene(325); @@ -3465,7 +3465,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) { _background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 300, 0, -1, -1, 1, NULL); switch (R2_GLOBALS._player._characterIndex) { - case 1: + case R2_QUINN: _sceneMode = 300; switch (R2_GLOBALS._sceneManager._previousScene) { @@ -3554,7 +3554,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) { } break; - case 3: + case R2_MIRANDA: if (R2_GLOBALS._sceneManager._previousScene == 1500) { R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3150; R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3150; @@ -3639,7 +3639,7 @@ void Scene300::signal() { default: R2_GLOBALS._player.enableControl(CURSOR_TALK); - if ((R2_GLOBALS._player._characterIndex != 1) || R2_GLOBALS.getFlag(44)) + if ((R2_GLOBALS._player._characterIndex != R2_QUINN) || R2_GLOBALS.getFlag(44)) R2_GLOBALS._player._canWalk = false; break; } diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 5b41a85326..e55ae8ff70 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -4469,7 +4469,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) { _quinn.changeZoom(-1); _quinn._effect = EFFECT_SHADED; - if (R2_GLOBALS._player._characterIndex != 1) + if (R2_GLOBALS._player._characterIndex != R2_QUINN) _quinn.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL); _seeker.postInit(); @@ -4478,7 +4478,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) { _seeker.changeZoom(-1); _seeker._effect = EFFECT_SHADED; - if (R2_GLOBALS._player._characterIndex != 2) + if (R2_GLOBALS._player._characterIndex != R2_SEEKER) _seeker.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL); _miranda.postInit(); @@ -4486,7 +4486,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) { _miranda.changeZoom(-1); _miranda._effect = EFFECT_SHADED; - if (R2_GLOBALS._player._characterIndex != 3) + if (R2_GLOBALS._player._characterIndex != R2_MIRANDA) _miranda.setDetails(9003, 1, -1, -1, 1, (SceneItem *) NULL); R2_GLOBALS._player.postInit(); |