diff options
| author | Paul Gilbert | 2013-07-29 22:24:25 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-07-29 22:24:25 -0400 |
| commit | a3e5c990058e780c9eb92c2fc7b6f13caa0ca14a (patch) | |
| tree | 987d0c9223b4bd98497658554fef823c0ab8993f /engines/tsage/ringworld2/ringworld2_speakers.cpp | |
| parent | 2088a77388f82489295d53bf1cc3b33d17f9dbd5 (diff) | |
| download | scummvm-rg350-a3e5c990058e780c9eb92c2fc7b6f13caa0ca14a.tar.gz scummvm-rg350-a3e5c990058e780c9eb92c2fc7b6f13caa0ca14a.tar.bz2 scummvm-rg350-a3e5c990058e780c9eb92c2fc7b6f13caa0ca14a.zip | |
TSAGE: Fixes for R2R extended conversations
Diffstat (limited to 'engines/tsage/ringworld2/ringworld2_speakers.cpp')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp index bff61bafc4..b8d593b90a 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -252,8 +252,8 @@ void VisualSpeaker::proc16() { _speakerMode = 0; _object1.remove(); - assert(_object2); - _object2->show(); + if (_object2) + _object2->show(); _object2 = NULL; _fieldF8 = 0; } @@ -1948,7 +1948,7 @@ void SpeakerSeeker300::proc15() { int v = _speakerMode; if (!_object2) { - if (R2_GLOBALS._player._characterIndex == 3) { + if (R2_GLOBALS._player._characterIndex == 2) { _object2 = &R2_GLOBALS._player; } else { Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene; |