From 697230709be6b9460b4a3ac9bc8d9c7f065562d2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 15 Aug 2011 20:47:59 +1000
Subject: TSAGE: Corrected casing of tSage namespace to be TsAGE

This matches the casing of the original engine name.
---
 engines/tsage/blue_force/blueforce_logic.cpp   | 10 ++++++----
 engines/tsage/blue_force/blueforce_logic.h     |  8 +++++---
 engines/tsage/blue_force/blueforce_scenes0.cpp |  4 ++--
 engines/tsage/blue_force/blueforce_scenes0.h   |  6 +++---
 engines/tsage/blue_force/blueforce_scenes1.cpp | 10 +++++-----
 engines/tsage/blue_force/blueforce_scenes1.h   |  8 ++++----
 6 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'engines/tsage/blue_force')

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index a29d677fb1..0238475533 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -27,13 +27,13 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace TsAGE {
 
 namespace BlueForce {
 
 void BlueForceGame::start() {
 	// Start the game
-	_globals->_sceneManager.changeScene(109);
+	_globals->_sceneManager.changeScene(100);
 
 	_globals->_events.setCursor(CURSOR_WALK);
 }
@@ -217,7 +217,9 @@ void SceneExt::dispatch() {
 
 void SceneExt::loadScene(int sceneNum) {
 	Scene::loadScene(sceneNum);
-	warning("TODO: word_51C38/word_51C3C");
+	
+	_v51C34.top = 0;
+	_v51C34.bottom = 300;
 }
 
 /*--------------------------------------------------------------------------*/
@@ -250,4 +252,4 @@ void GameScene::remove() {
 
 } // End of namespace BlueForce
 
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index e870fa1430..1ff6ecf507 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -31,11 +31,11 @@
 
 #define BF_INTERFACE_Y 168
 
-namespace tSage {
+namespace TsAGE {
 
 namespace BlueForce {
 
-using namespace tSage;
+using namespace TsAGE;
 
 class BlueForceGame: public Game {
 public:
@@ -64,6 +64,8 @@ public:
 	int _field372;
 	int _field37A;
 	EventHandler *_field37C;
+
+	Rect _v51C34;
 public:
 	SceneExt();
 
@@ -92,6 +94,6 @@ public:
 
 } // End of namespace BlueForce
 
-} // End of namespace tSage
+} // End of namespace TsAGE
 
 #endif
diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index a47d7d712f..cc0f9bb1fd 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -25,7 +25,7 @@
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
 
-namespace tSage {
+namespace TsAGE {
 
 namespace BlueForce {
 
@@ -241,4 +241,4 @@ void Scene50::Tooltip2::dispatch() {
 
 } // End of namespace BlueForce
 
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 7eda443ee9..587941e59e 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -32,11 +32,11 @@
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 
-namespace tSage {
+namespace TsAGE {
 
 namespace BlueForce {
 
-using namespace tSage;
+using namespace TsAGE;
 
 class Scene20 : public SceneExt {
 	/* Actions */
@@ -82,6 +82,6 @@ public:
 
 } // End of namespace BlueForce
 
-} // End of namespace tSage
+} // End of namespace TsAGE
 
 #endif
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index 1dafff2bce..e5d66bcbb5 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -27,7 +27,7 @@
 #include "tsage/staticres.h"
 #include "tsage/globals.h"
 
-namespace tSage {
+namespace TsAGE {
 
 namespace BlueForce {
 
@@ -149,7 +149,7 @@ void Scene100::Action2::signal() {
 
 /*--------------------------------------------------------------------------*/
 
-Scene100::Scene100(): Scene() {
+Scene100::Scene100(): SceneExt() {
 	_index = 0;
 }
 
@@ -168,12 +168,12 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 		// Title
 		loadScene(100);
 		BF_GLOBALS._sound1.play(2);
-		setAction(&_action2, this);
+//		setAction(&_action2, this);
 	} else {
 		// Credits
 		loadScene(101);
 		BF_GLOBALS._sound1.play(118);
-		setAction(&_action1, this);
+//		setAction(&_action1, this);
 	}
 
 	loadScene(20);
@@ -420,4 +420,4 @@ void Scene109::signal() {
 
 } // End of namespace BlueForce
 
-} // End of namespace tSage
+} // End of namespace TsAGE
diff --git a/engines/tsage/blue_force/blueforce_scenes1.h b/engines/tsage/blue_force/blueforce_scenes1.h
index 86ca4a9f14..d6cde0a44d 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.h
+++ b/engines/tsage/blue_force/blueforce_scenes1.h
@@ -32,13 +32,13 @@
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 
-namespace tSage {
+namespace TsAGE {
 
 namespace BlueForce {
 
-using namespace tSage;
+using namespace TsAGE;
 
-class Scene100: public Scene {
+class Scene100: public SceneExt {
 	/* Actions */
 	class Action1: public ActionExt {
 	private:
@@ -119,6 +119,6 @@ public:
 
 } // End of namespace BlueForce
 
-} // End of namespace tSage
+} // End of namespace TsAGE
 
 #endif
-- 
cgit v1.2.3