diff options
| author | Willem Jan Palenstijn | 2013-09-30 22:05:32 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-30 22:05:32 +0200 |
| commit | 8e58be7a1d39d8235ddd7beb876de1ff3988fca5 (patch) | |
| tree | 64cebc37a319e17299a6a37a8b13b35742174d58 /engines/tsage/ringworld2/ringworld2_dialogs.cpp | |
| parent | 057b01951a92cc17e6c7a5121d2bd866841c4f75 (diff) | |
| parent | 17df6b343a0fdb2168b4d3a22927cd0f584ce735 (diff) | |
| download | scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.gz scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.tar.bz2 scummvm-rg350-8e58be7a1d39d8235ddd7beb876de1ff3988fca5.zip | |
Merge branch 'master' into wme_rendering
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_dialogs.cpp')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_dialogs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp index 663697d94d..057d91a46e 100644 --- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp +++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp @@ -235,7 +235,7 @@ void CharacterDialog::show() { scene->saveCharacter(oldCharacter); // Play the correctfrequency, if any, of the character being switched to's scanner device - if (R2_GLOBALS._player._characterScene[0] != 300) { + if (R2_GLOBALS._player._characterScene[R2_NONE] != 300) { switch (R2_GLOBALS._scannerFrequencies[R2_GLOBALS._player._characterIndex] - 1) { case 0: R2_GLOBALS._sound4.stop(); |