diff options
author | Paul Gilbert | 2011-04-17 22:00:31 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-04-17 22:01:24 +1000 |
commit | f79b91548de6daf2c3bf9661e2a002b23744e99e (patch) | |
tree | fc661db5b09cf02d01e912c9f4bc42c4a62703c8 /engines/tsage | |
parent | 886ea29bbfe5556729843d97637ea9f691382ddc (diff) | |
download | scummvm-rg350-f79b91548de6daf2c3bf9661e2a002b23744e99e.tar.gz scummvm-rg350-f79b91548de6daf2c3bf9661e2a002b23744e99e.tar.bz2 scummvm-rg350-f79b91548de6daf2c3bf9661e2a002b23744e99e.zip |
TSAGE: Bugfixes for Scene #2300 - Starship Hanger
Diffstat (limited to 'engines/tsage')
-rw-r--r-- | engines/tsage/ringworld_scenes3.cpp | 6 | ||||
-rw-r--r-- | engines/tsage/ringworld_scenes3.h | 17 |
2 files changed, 8 insertions, 15 deletions
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp index 0cf299c2de..b4a456e748 100644 --- a/engines/tsage/ringworld_scenes3.cpp +++ b/engines/tsage/ringworld_scenes3.cpp @@ -4546,7 +4546,7 @@ void Scene2300::Action2::signal() { case 7: scene->_hotspot7._strip = 2; scene->_hotspot7._frame = 1; - scene->_hotspot7.animate(ANIM_MODE_7, this); + scene->_hotspot7.animate(ANIM_MODE_5, this); break; case 8: scene->_hotspot2.animate(ANIM_MODE_6, this); @@ -4672,7 +4672,7 @@ void Scene2300::Hotspot5::doAction(int action) { } } -void Scene2300::Hotspot6::doAction(int action) { +void Scene2300::Hotspot7::doAction(int action) { Scene2300 *scene = (Scene2300 *)_globals->_sceneManager._scene; switch (action) { @@ -4707,7 +4707,7 @@ void Scene2300::postInit(SceneObjectList *OwnerList) { setZoomPercents(0, 100, 200, 100); _stripManager.addSpeaker(&_speakerSL); - _stripManager.addSpeaker(&_speakerML); + _stripManager.addSpeaker(&_speakerMText); _stripManager.addSpeaker(&_speakerQText); _stripManager.addSpeaker(&_speakerSText); diff --git a/engines/tsage/ringworld_scenes3.h b/engines/tsage/ringworld_scenes3.h index 61aac522f2..85f454a61e 100644 --- a/engines/tsage/ringworld_scenes3.h +++ b/engines/tsage/ringworld_scenes3.h @@ -710,22 +710,14 @@ class Scene2300 : public Scene { public: virtual void doAction(int action); }; - class Hotspot6 : public SceneObject { - public: - virtual void doAction(int action); - }; - class Hotspot12 : public SceneObject { - public: - virtual void doAction(int action); - }; - class Hotspot13 : public SceneObject { + class Hotspot7 : public SceneObject { public: virtual void doAction(int action); }; public: SoundHandler _soundHandler1, _soundHandler2; SpeakerSL _speakerSL; - SpeakerML _speakerML; + SpeakerMText _speakerMText; SpeakerQText _speakerQText; SpeakerSText _speakerSText; Action1 _action1; @@ -734,8 +726,9 @@ public: Action4 _action4; SceneObject _hotspot1, _hotspot2, _hotspot3, _hotspot4; Hotspot5 _hotspot5; - Hotspot6 _hotspot6; - SceneObject _hotspot7, _hotspot8, _hotspot9, _hotspot10; + SceneObject _hotspot6; + Hotspot7 _hotspot7; + SceneObject _hotspot8, _hotspot9, _hotspot10; DisplayHotspot _hotspot11, _hotspot12, _hotspot13, _hotspot14, _hotspot15; Scene2300(); |