[Scummvm-cvs-logs] scummvm master -> dc62da925f7818056c4880e0d8aa134839e17638
Strangerke
Strangerke at scummvm.org
Mon Dec 5 23:46:42 CET 2011
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:
dc62da925f TSAGE: R2R - Fix several erroneous references to BF_GLOBALS
Commit: dc62da925f7818056c4880e0d8aa134839e17638
https://github.com/scummvm/scummvm/commit/dc62da925f7818056c4880e0d8aa134839e17638
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-12-05T14:45:59-08:00
Commit Message:
TSAGE: R2R - Fix several erroneous references to BF_GLOBALS
Changed paths:
engines/tsage/ringworld2/ringworld2_dialogs.cpp
engines/tsage/ringworld2/ringworld2_scenes2.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index 997f8cc..54a15f3 100644
--- 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
index ad45735..be96b1e 100644
--- 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);
More information about the Scummvm-git-logs
mailing list