TSAGE: R2R - Fix several erroneous references to BF_GLOBALS

scummvm · Dec 5, 2011 · dc62da9 · dc62da9
1 parent 63f2457
commit dc62da9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -50,7 +50,7 @@ RightClickDialog::RightClickDialog() : GfxDialog() {
 	_btnList[5] = Common::Point(83, 47);
 
 	// Set the palette and change the cursor
-	BF_GLOBALS._events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 
 	setPalette();
 
@@ -185,7 +185,7 @@ void RightClickDialog::execute() {
 	}
 
 	if (cursorNum != CURSOR_NONE)
-		BF_GLOBALS._events.setCursor(cursorNum);
+		R2_GLOBALS._events.setCursor(cursorNum);
 
 	_gfxManager.deactivate();
 }
@@ -345,7 +345,7 @@ CharacterDialog::CharacterDialog() {
 
 void HelpDialog::show() {
 	// Set the palette and change the cursor
-	BF_GLOBALS._events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 
 	// Create the dialog and draw it
 	HelpDialog *dlg = new HelpDialog();

diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -557,7 +557,7 @@ void Scene2000::Exit1::changeScene() {
 	warning("TODO: Check sub_22D26");
 	Common::Point pt(-10, 129);
 	NpcMover *mover = new NpcMover();
-	BF_GLOBALS._player.addMover(mover, &pt, scene);
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
 
 	scene->setAction(&scene->_sequenceManager, scene, 206, &R2_GLOBALS._player, NULL);
 }
@@ -575,7 +575,7 @@ void Scene2000::Exit2::changeScene() {
 	warning("TODO: Check sub_22D26");
 	Common::Point pt(330, 129);
 	NpcMover *mover = new NpcMover();
-	BF_GLOBALS._player.addMover(mover, &pt, scene);
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
 }
 
 void Scene2000::Exit3::changeScene() {
@@ -1028,7 +1028,7 @@ void Scene2000::process(Event &event) {
 
 		Common::Point pt(event.mousePos.x, 129);
 		PlayerMover *mover = new PlayerMover();
-		BF_GLOBALS._player.addMover(mover, &pt, this);
+		R2_GLOBALS._player.addMover(mover, &pt, this);
 
 		event.handled = true;
 	}
@@ -1215,7 +1215,7 @@ void Scene2350::process(Event &event) {
 			(R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)){
 		Common::Point pt(event.mousePos.x, 129);
 		PlayerMover *mover = new PlayerMover();
-		BF_GLOBALS._player.addMover(mover, &pt);
+		R2_GLOBALS._player.addMover(mover, &pt);
 		event.handled = true;
 	}
 	Scene::process(event);