aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-10-09 18:18:47 +1100
committerPaul Gilbert2011-10-09 18:18:47 +1100
commit04854256974ad9bd04120a4d5b331d54999af68f (patch)
tree419e889d8b32819239dca13c5b21e4a870c11982
parenta5a1bf253bbf7fda2dee4323b95cfa796b717e2c (diff)
downloadscummvm-rg350-04854256974ad9bd04120a4d5b331d54999af68f.tar.gz
scummvm-rg350-04854256974ad9bd04120a4d5b331d54999af68f.tar.bz2
scummvm-rg350-04854256974ad9bd04120a4d5b331d54999af68f.zip
TSAGE: Changed Blue Force startup back to title screen and fixed some startup glitches
-rw-r--r--engines/tsage/blue_force/blueforce_logic.cpp4
-rw-r--r--engines/tsage/blue_force/blueforce_scenes0.cpp1
-rw-r--r--engines/tsage/blue_force/blueforce_scenes1.cpp1
-rw-r--r--engines/tsage/globals.cpp1
4 files changed, 4 insertions, 3 deletions
diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 39d0bbaeb7..6f8d68566e 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -43,9 +43,7 @@ namespace BlueForce {
void BlueForceGame::start() {
// Start the game
- g_globals->_sceneManager.changeScene(300);
-
- g_globals->_events.setCursor(CURSOR_WALK);
+ g_globals->_sceneManager.changeScene(20);
}
Scene *BlueForceGame::createScene(int sceneNumber) {
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 1e8c535f5f..a4d9bc561f 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -123,6 +123,7 @@ void Scene20::postInit(SceneObjectList *OwnerList) {
loadScene(20);
Scene::postInit();
setZoomPercents(60, 85, 200, 100);
+ BF_GLOBALS._interfaceY = SCREEN_HEIGHT;
_scenePalette.loadPalette(1);
_scenePalette.loadPalette(22);
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index c953584665..0d5482615e 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -140,6 +140,7 @@ void Scene100::Action2::signal() {
} else {
// Prompt user for whether to start play or watch introduction
g_globals->_player.enableControl();
+ g_globals->_events.setCursor(CURSOR_WALK);
if (MessageDialog::show2(WATCH_INTRO_MSG, START_PLAY_BTN_STRING, INTRODUCTION_BTN_STRING) == 0) {
// Signal to start the game
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 788ab71b76..715bf552f0 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -230,6 +230,7 @@ void BlueForceGlobals::reset() {
((BlueForceInvObjectList *)_inventory)->reset();
BF_GLOBALS._uiElements.updateInventory();
BF_GLOBALS._uiElements._scoreValue = 0;
+ BF_GLOBALS._uiElements._active = false;
_mapLocationId = 1;
_driveFromScene = 300;