diff options
author | Paul Gilbert | 2011-04-28 22:15:28 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-04-28 22:16:06 +1000 |
commit | 0c0dde62b91dfd0dc57cbe27621e70dba62fcdf5 (patch) | |
tree | aff1b81d74fd84e397c6be492465753705745ebd | |
parent | 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 (diff) | |
download | scummvm-rg350-0c0dde62b91dfd0dc57cbe27621e70dba62fcdf5.tar.gz scummvm-rg350-0c0dde62b91dfd0dc57cbe27621e70dba62fcdf5.tar.bz2 scummvm-rg350-0c0dde62b91dfd0dc57cbe27621e70dba62fcdf5.zip |
TSAGE: Slowed down Scene #6100 to a reasonable speed, and finished code for hitting sunflowers
-rw-r--r-- | engines/tsage/ringworld_scenes1.cpp | 17 | ||||
-rw-r--r-- | engines/tsage/scenes.cpp | 1 |
2 files changed, 10 insertions, 8 deletions
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp index fd51670fb8..7886c51557 100644 --- a/engines/tsage/ringworld_scenes1.cpp +++ b/engines/tsage/ringworld_scenes1.cpp @@ -2879,7 +2879,7 @@ void Scene6100::Action3::signal() { break; case 1: _globals->_scenePalette.clearListeners(); - scene->_fadePercent = 0; + scene->_fadePercent = 100; _globals->_scenePalette.refresh(); scene->loadScene(9997); scene->_object1.hide(); @@ -2890,7 +2890,7 @@ void Scene6100::Action3::signal() { scene->_sunflower3.hide(); scene->_rocks.hide(); scene->_sceneText.hide(); - + _globals->_events.setCursor(CURSOR_WALK); scene->_stripManager.start(8120, this); break; @@ -2995,23 +2995,24 @@ void Scene6100::Action5::dispatch() { } scene->_objList[idx]->_flags |= OBJFLAG_PANES; -/* + if ((idx != 3) && (scene->_fadePercent == 100) && - (tempSet.sqrt(floatSet) < 150.0)) { + (tempSet.sqrt(zeroSet) < 150.0)) { switch (scene->_hitCount++) { case 1: scene->_soundHandler.startSound(233); scene->showMessage(0, NULL, 0); if (!_globals->getFlag(76)) - scene->_object5.setAction(&scene->_action2); + scene->_probe.setAction(&scene->_action2); + break; case 2: scene->_soundHandler.startSound(234); scene->showMessage(0, NULL, 0); if (!_globals->getFlag(76)) - scene->_object5.setAction(NULL); + scene->_probe.setAction(NULL); scene->setAction(&scene->_action3); break; @@ -3020,14 +3021,13 @@ void Scene6100::Action5::dispatch() { scene->showMessage(0, NULL, 0); if (!_globals->getFlag(76)) - scene->_object5.setAction(&scene->_action1); + scene->_probe.setAction(&scene->_action1); break; } _globals->_scenePalette.clearListeners(); scene->_fadePercent = 0; } - */ } } @@ -3129,6 +3129,7 @@ void Scene6100::postInit(SceneObjectList *OwnerList) { loadScene(6100); Scene::postInit(); setZoomPercents(62, 2, 200, 425); + _globals->_sceneHandler._delayTicks = 8; _globals->_player.disableControl(); _globals->_events.setCursor(CURSOR_WALK); diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index f5f3444595..9a99049c19 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -114,6 +114,7 @@ void SceneManager::sceneChange() { assert(_objectCount == _saver->getObjectCount()); } _objectCount = _saver->getObjectCount(); + _globals->_sceneHandler._delayTicks = 2; // Instantiate and set the new scene _scene = getNewScene(); |