diff options
| author | Paul Gilbert | 2013-11-10 15:55:51 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-10 15:55:51 -0500 |
| commit | a1cc19f91667f292564664a9eb0d656ff96257c3 (patch) | |
| tree | 1c00b6292d55fcaa342d425ffadef018febce20d /engines/tsage/ringworld2 | |
| parent | 9dd2898321b2615f6715314dfe50079421b1c20d (diff) | |
| download | scummvm-rg350-a1cc19f91667f292564664a9eb0d656ff96257c3.tar.gz scummvm-rg350-a1cc19f91667f292564664a9eb0d656ff96257c3.tar.bz2 scummvm-rg350-a1cc19f91667f292564664a9eb0d656ff96257c3.zip | |
TSAGE: Fix for Webbster speaking during R2R intro sequence
Diffstat (limited to 'engines/tsage/ringworld2')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 12 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.h | 2 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index b5f40817bf..6a438d7fb3 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -1755,17 +1755,17 @@ void Scene180::signal() { _teal.setPosition(Common::Point(161, 97)); _teal.hide(); - _webbser.postInit(); - _webbser.setPosition(Common::Point(60, 96)); - _webbser.hide(); + _webbster.postInit(); + _webbster.setPosition(Common::Point(60, 96)); + _webbster.hide(); _stripManager.start(11, this); break; case 33: _teal.hide(); - _webbser.setup(76, 4, 1); - _webbser.setFrame(_webbser.getFrameCount()); + _webbster.setup(76, 4, 1); + _webbster.setFrame(_webbster.getFrameCount()); _shipDisplay.postInit(); _shipDisplay.setup(75, 1, 1); @@ -1777,7 +1777,7 @@ void Scene180::signal() { case 34: _teal.hide(); - _webbser.hide(); + _webbster.hide(); _dutyOfficer.postInit(); _dutyOfficer.setup(76, 2, 1); diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index 2013b041c7..aa3182c08d 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -201,7 +201,7 @@ public: SpeakerDutyOfficer180 _dutyOfficerSpeaker; SpeakerTeal180 _tealSpeaker; SpeakerGameText _gameTextSpeaker; - SceneActor _dutyOfficer, _teal, _webbser, _door, _shipDisplay; + SceneActor _dutyOfficer, _teal, _webbster, _door, _shipDisplay; ScenePalette _palette; SceneText _textList[20]; AnimationPlayerExt _animationPlayer; diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp index 61236ee504..19f40c8864 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.cpp +++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp @@ -2943,7 +2943,7 @@ SpeakerWebbster::SpeakerWebbster(int color) { } void SpeakerWebbster180::proc15() { - Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene; + Scene180 *scene = (Scene180 *)R2_GLOBALS._sceneManager._scene; int v = _speakerMode; @@ -2974,7 +2974,7 @@ void SpeakerWebbster180::proc15() { break; case 3: ((SceneItem *)_action)->_sceneRegionId = 0; - _object1.setup(75, 6, 1); + _object1.setup(76, 6, 1); _object1.animate(ANIM_MODE_5, this); break; default: |