diff options
| author | RichieSams | 2013-09-16 00:46:19 -0500 |
|---|---|---|
| committer | RichieSams | 2013-09-16 00:46:19 -0500 |
| commit | b5c762168edd83a6c5e1b442aee728150b447d98 (patch) | |
| tree | 10e419dfaf4fabf75b1458c13383efadad348bd4 /engines/tsage/ringworld2/ringworld2_dialogs.cpp | |
| parent | a0a67a2d470816b13bab10371494652d77b23611 (diff) | |
| parent | 914535a460aa3b3f23bf3ce807619ba388e14135 (diff) | |
| download | scummvm-rg350-b5c762168edd83a6c5e1b442aee728150b447d98.tar.gz scummvm-rg350-b5c762168edd83a6c5e1b442aee728150b447d98.tar.bz2 scummvm-rg350-b5c762168edd83a6c5e1b442aee728150b447d98.zip | |
Merge branch 'master' into zvision
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_dialogs.cpp')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_dialogs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp index e2afa574de..663697d94d 100644 --- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp +++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp @@ -272,7 +272,7 @@ void CharacterDialog::show() { default: break; } - } else if ((R2_GLOBALS._player._characterScene[1] == 300) && (R2_GLOBALS._scannerFrequencies[1] != 1)) { + } else if ((R2_GLOBALS._player._characterScene[R2_QUINN] == 300) && (R2_GLOBALS._scannerFrequencies[1] != 1)) { switch (R2_GLOBALS._scannerFrequencies[1] - 1) { case 2: R2_GLOBALS._sound4.play(45); @@ -289,7 +289,7 @@ void CharacterDialog::show() { default: break; } - } else if (R2_GLOBALS._player._characterScene[2] != 300) { + } else if (R2_GLOBALS._player._characterScene[R2_SEEKER] != 300) { R2_GLOBALS._sound4.stop(); } else if (R2_GLOBALS._scannerFrequencies[2] == 1) { R2_GLOBALS._sound4.stop(); |