aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2011-04-09 15:12:17 +1000
committerPaul Gilbert2011-04-09 15:12:17 +1000
commitb912b3662a753e2766bca4fb8a0d666cdebce349 (patch)
treee6946e96acc97f745ef1a6da894ff5e8a43af3e3 /engines
parenta79ba2b4f4ef069f9400a18505be8a29da2d0228 (diff)
downloadscummvm-rg350-b912b3662a753e2766bca4fb8a0d666cdebce349.tar.gz
scummvm-rg350-b912b3662a753e2766bca4fb8a0d666cdebce349.tar.bz2
scummvm-rg350-b912b3662a753e2766bca4fb8a0d666cdebce349.zip
TSAGE: Slight re-ordering of method calls in SceneHandler::dispatch
This fixes a problem in the title screen where the game title briefly appeared at full size.
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/core.cpp7
-rw-r--r--engines/tsage/ringworld_scenes1.cpp3
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 7a461d2496..d3ca30e012 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -3513,9 +3513,14 @@ void SceneHandler::dispatch() {
while (_globals->_events.getEvent(event))
process(event);
+ // Handle drawing the contents of the scene
+ if (_globals->_sceneManager._scene)
+ _globals->_sceneObjects->draw();
+
+ // Check to see if any scene change is required
_globals->_sceneManager.checkScene();
- _globals->_sceneObjects->draw();
+ // Signal the ScummVM debugger
_vm->_debugger->onFrame();
// Delay between frames
diff --git a/engines/tsage/ringworld_scenes1.cpp b/engines/tsage/ringworld_scenes1.cpp
index 88ebbfae71..033c684aeb 100644
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@ -2965,7 +2965,7 @@ void Scene6100::Action5::dispatch() {
}
scene->_objList[idx]->_flags |= OBJFLAG_PANES;
-
+/*
if ((idx != 3) && (scene->_fadePercent == 100) &&
(tempSet.sqrt(floatSet) < 150.0)) {
switch (scene->_field_312++) {
@@ -2997,6 +2997,7 @@ void Scene6100::Action5::dispatch() {
_globals->_scenePalette.clearListeners();
scene->_fadePercent = 0;
}
+ */
}
}