[Scummvm-cvs-logs] scummvm master -> 04854256974ad9bd04120a4d5b331d54999af68f

[dreammaster]

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:
0485425697 TSAGE: Changed Blue Force startup back to title screen and fixed some startup glitches


Commit: 04854256974ad9bd04120a4d5b331d54999af68f
    https://github.com/scummvm/scummvm/commit/04854256974ad9bd04120a4d5b331d54999af68f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-10-09T00:18:47-07:00

Commit Message:
TSAGE: Changed Blue Force startup back to title screen and fixed some startup glitches

Changed paths:
    engines/tsage/blue_force/blueforce_logic.cpp
    engines/tsage/blue_force/blueforce_scenes0.cpp
    engines/tsage/blue_force/blueforce_scenes1.cpp
    engines/tsage/globals.cpp



diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 39d0bba..6f8d685 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 1e8c535..a4d9bc5 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 c953584..0d54826 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 788ab71..715bf55 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;