TSAGE: Added 'g' prefix to global variables

6 files changed, 33 insertions, 33 deletions

diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index 2d4f6adcf0..86feceb015 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -66,10 +66,10 @@ RightClickDialog::RightClickDialog() : GfxDialog() {
 	// Set the dialog position
 	Rect dialogRect;
 	dialogRect.resize(_surface, 0, 0, 100);
-	dialogRect.center(_globals->_events._mousePos.x, _globals->_events._mousePos.y);
+	dialogRect.center(g_globals->_events._mousePos.x, g_globals->_events._mousePos.y);
 
 	// Ensure the dialog will be entirely on-screen
-	Rect screenRect = _globals->gfxManager()._bounds;
+	Rect screenRect = g_globals->gfxManager()._bounds;
 	screenRect.collapse(4, 4);
 	dialogRect.contain(screenRect);
 
@@ -88,10 +88,10 @@ RightClickDialog::~RightClickDialog() {
 
 void RightClickDialog::draw() {
 	// Save the covered background area
-	_savedArea = Surface_getArea(_globals->_gfxManagerInstance.getSurface(), _bounds);
+	_savedArea = Surface_getArea(g_globals->_gfxManagerInstance.getSurface(), _bounds);
 
 	// Draw the dialog image
-	_globals->gfxManager().copyFrom(_surface, _bounds.left, _bounds.top);
+	g_globals->gfxManager().copyFrom(_surface, _bounds.left, _bounds.top);
 
 	// Pre-process rect lists
 	for (int idx = 0; idx < 5; ++idx) {
@@ -153,9 +153,9 @@ void RightClickDialog::execute() {
 	// Dialog event handler loop
 	_gfxManager.activate();
 
-	while (!_vm->shouldQuit() && (_selectedAction == -1)) {
+	while (!g_vm->shouldQuit() && (_selectedAction == -1)) {
 		Event evt;
-		while (_globals->_events.getEvent(evt, EVENT_MOUSE_MOVE | EVENT_BUTTON_DOWN)) {
+		while (g_globals->_events.getEvent(evt, EVENT_MOUSE_MOVE | EVENT_BUTTON_DOWN)) {
 			evt.mousePos.x -= _bounds.left;
 			evt.mousePos.y -= _bounds.top;
 
@@ -232,9 +232,9 @@ void AmmoBeltDialog::execute() {
 	// Dialog event handler loop
 	_gfxManager.activate();
 
-	while (!_vm->shouldQuit() && !_closeFlag) {
+	while (!g_vm->shouldQuit() && !_closeFlag) {
 		Event evt;
-		while (_globals->_events.getEvent(evt, EVENT_MOUSE_MOVE | EVENT_BUTTON_DOWN)) {
+		while (g_globals->_events.getEvent(evt, EVENT_MOUSE_MOVE | EVENT_BUTTON_DOWN)) {
 			evt.mousePos.x -= _bounds.left;
 			evt.mousePos.y -= _bounds.top;
 
@@ -321,13 +321,13 @@ void AmmoBeltDialog::draw() {
 
 	if (!_savedArea) {
 		// Save the covered background area
-		_savedArea = Surface_getArea(_globals->_gfxManagerInstance.getSurface(), _bounds);
+		_savedArea = Surface_getArea(g_globals->_gfxManagerInstance.getSurface(), _bounds);
 	} else {
 		bounds.moveTo(0, 0);
 	}
 
 	// Draw the dialog image
-	_globals->gfxManager().copyFrom(_surface, bounds.left, bounds.top);
+	g_globals->gfxManager().copyFrom(_surface, bounds.left, bounds.top);
 
 	// Setup clip flags
 	bool clip1 = true, clip2 = true;
@@ -344,7 +344,7 @@ void AmmoBeltDialog::draw() {
 	if (clip1) {
 		GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip1Bullets);
 		_clip1Rect.resize(clipSurface, _clip1Rect.left, _clip1Rect.top, 100);
-		_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip1Rect.left,
+		g_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip1Rect.left,
 			bounds.top + _clip1Rect.top);
 	}
 
@@ -352,7 +352,7 @@ void AmmoBeltDialog::draw() {
 	if (clip2) {
 		GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip2Bullets);
 		_clip2Rect.resize(clipSurface, _clip2Rect.left, _clip2Rect.top, 100);
-		_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip2Rect.left,
+		g_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip2Rect.left,
 			bounds.top + _clip2Rect.top);
 	}
 
@@ -360,7 +360,7 @@ void AmmoBeltDialog::draw() {
 	if (gunLoaded) {
 		GfxSurface loadedSurface = surfaceFromRes(9, 7, 1);
 		_loadedRect.resize(loadedSurface, _loadedRect.left, _loadedRect.top, 100);
-		_globals->gfxManager().copyFrom(loadedSurface, bounds.left + _loadedRect.left,
+		g_globals->gfxManager().copyFrom(loadedSurface, bounds.left + _loadedRect.left,
 			bounds.top + _loadedRect.top);
 	}
 }
diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 80b379d5d5..15d68ae4f0 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -43,9 +43,9 @@ namespace BlueForce {
 
 void BlueForceGame::start() {
 	// Start the game
-	_globals->_sceneManager.changeScene(300);
+	g_globals->_sceneManager.changeScene(300);
 
-	_globals->_events.setCursor(CURSOR_WALK);
+	g_globals->_events.setCursor(CURSOR_WALK);
 }
 
 Scene *BlueForceGame::createScene(int sceneNumber) {
@@ -240,20 +240,20 @@ void BlueForceGame::processEvent(Event &event) {
 		case Common::KEYCODE_F4:
 			// F4 - Restart
 			restartGame();
-			_globals->_events.setCursorFromFlag();
+			g_globals->_events.setCursorFromFlag();
 			break;
 
 		case Common::KEYCODE_F7:
 			// F7 - Restore
 			restoreGame();
-			_globals->_events.setCursorFromFlag();
+			g_globals->_events.setCursorFromFlag();
 			break;
 
 		case Common::KEYCODE_F10:
 			// F10 - Pause
 			GfxDialog::setPalette();
 			MessageDialog::show(GAME_PAUSED_MSG, OK_BTN_STRING);
-			_globals->_events.setCursorFromFlag();
+			g_globals->_events.setCursorFromFlag();
 			break;
 
 		default:
@@ -470,16 +470,16 @@ void NamedObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int u
 
 	switch (mode) {
 	case 2:
-		_globals->_sceneItems.push_front(this);
+		g_globals->_sceneItems.push_front(this);
 		break;
 	case 4:
-		_globals->_sceneItems.addBefore(item, this);
+		g_globals->_sceneItems.addBefore(item, this);
 		break;
 	case 5:
-		_globals->_sceneItems.addAfter(item, this);
+		g_globals->_sceneItems.addAfter(item, this);
 		break;
 	default:
-		_globals->_sceneItems.push_back(this);
+		g_globals->_sceneItems.push_back(this);
 		break;
 	}
 }
diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index 0184c6503b..969e4abd8b 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -35,7 +35,7 @@ namespace BlueForce {
 
 using namespace TsAGE;
 
-#define BF_INVENTORY (*((::TsAGE::BlueForce::BlueForceInvObjectList *)_globals->_inventory))
+#define BF_INVENTORY (*((::TsAGE::BlueForce::BlueForceInvObjectList *)g_globals->_inventory))
 
 class BlueForceGame: public Game {
 public:
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index 0d47cb1c5d..c953584665 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -56,9 +56,9 @@ void Scene100::Action1::signal() {
 		setDelay(6);
 		break;
 	case 1: {
-		Common::String msg1 = _resourceManager->getMessage(100, _state++);
+		Common::String msg1 = g_resourceManager->getMessage(100, _state++);
 		if (msg1.compareTo("LASTCREDIT")) {
-			Common::String msg2 = _resourceManager->getMessage(100, _state++);
+			Common::String msg2 = g_resourceManager->getMessage(100, _state++);
 			setTextStrings(msg1, msg2, this);
 			--_actionIndex;
 		} else {
@@ -121,7 +121,7 @@ void Scene100::Action1::setTextStrings(const Common::String &msg1, const Common:
 }
 
 void Scene100::Action2::signal() {
-	Scene100 *scene = (Scene100 *)_globals->_sceneManager._scene;
+	Scene100 *scene = (Scene100 *)g_globals->_sceneManager._scene;
 	static byte black[3] = {0, 0, 0};
 
 	switch (_actionIndex++) {
@@ -139,7 +139,7 @@ void Scene100::Action2::signal() {
 			ConfMan.flushToDisk();
 		} else {
 			// Prompt user for whether to start play or watch introduction
-			_globals->_player.enableControl();
+			g_globals->_player.enableControl();
 
 			if (MessageDialog::show2(WATCH_INTRO_MSG, START_PLAY_BTN_STRING, INTRODUCTION_BTN_STRING) == 0) {
 				// Signal to start the game
@@ -150,7 +150,7 @@ void Scene100::Action2::signal() {
 		}
 
 		// At this point the introduction needs to start
-		_globals->_scenePalette.addFader(black, 1, 2, this);
+		g_globals->_scenePalette.addFader(black, 1, 2, this);
 		break;
 	}
 	case 3:
@@ -178,9 +178,9 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._v51C44 = 1;
 	BF_GLOBALS._interfaceY = SCREEN_HEIGHT;
 
-	_globals->_player.postInit();
-	_globals->_player.hide();
-	_globals->_player.disableControl();
+	g_globals->_player.postInit();
+	g_globals->_player.hide();
+	g_globals->_player.disableControl();
 	_index = 109;
 
 	if (BF_GLOBALS._dayNumber < 6) {
diff --git a/engines/tsage/blue_force/blueforce_scenes6.cpp b/engines/tsage/blue_force/blueforce_scenes6.cpp
index e6101039ab..dec17b2f6b 100644
--- a/engines/tsage/blue_force/blueforce_scenes6.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes6.cpp
@@ -355,7 +355,7 @@ void Scene666::signal() {
 	_text._fontNumber = 4;
 	_text._width = 150;
 
-	Common::String msg = _resourceManager->getMessage(666, BF_GLOBALS._deathReason);
+	Common::String msg = g_resourceManager->getMessage(666, BF_GLOBALS._deathReason);
 	sceneBounds = BF_GLOBALS._sceneManager._scene->_sceneBounds;
 	sceneBounds.collapse(4, 2);
 	BF_GLOBALS.gfxManager()._font.getStringBounds(msg.c_str(), textRect, _text._width);
diff --git a/engines/tsage/blue_force/blueforce_ui.cpp b/engines/tsage/blue_force/blueforce_ui.cpp
index a4edffbe39..fb4008d2c1 100644
--- a/engines/tsage/blue_force/blueforce_ui.cpp
+++ b/engines/tsage/blue_force/blueforce_ui.cpp
@@ -272,7 +272,7 @@ void UICollection::draw() {
 
 UIElements::UIElements(): UICollection() {
 	_cursorVisage.setVisage(1, 5);
-	_saver->addLoadNotifier(&UIElements::loadNotifierProc);
+	g_saver->addLoadNotifier(&UIElements::loadNotifierProc);
 }
 
 void UIElements::synchronize(Serializer &s) {