libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 04:01:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Get rid of some magic values

Browse Source
This commit is contained in:
Strangerke 2014-01-27 07:53:34 +01:00
parent f92df4c6aa
commit 3a236181c4
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/tsage/ringworld2/ringworld2_dialogs.cpp
View File

@ -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:

12
engines/tsage/ringworld2/ringworld2_scenes0.cpp
View File

@ -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;
}

6
engines/tsage/ringworld2/ringworld2_scenes3.cpp
View File

@ -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();