[Scummvm-cvs-logs] scummvm master -> 0c0dde62b91dfd0dc57cbe27621e70dba62fcdf5
dreammaster
dreammaster at scummvm.org
Thu Apr 28 14:17:39 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0c0dde62b9 TSAGE: Slowed down Scene #6100 to a reasonable speed, and finished code for hitting sunflowers
Commit: 0c0dde62b91dfd0dc57cbe27621e70dba62fcdf5
https://github.com/scummvm/scummvm/commit/0c0dde62b91dfd0dc57cbe27621e70dba62fcdf5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-28T05:16:06-07:00
Commit Message:
TSAGE: Slowed down Scene #6100 to a reasonable speed, and finished code for hitting sunflowers
Changed paths:
engines/tsage/ringworld_scenes1.cpp
engines/tsage/scenes.cpp
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index fd51670..7886c51 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 f5f3444..9a99049 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();
More information about the Scummvm-git-logs
mailing list