aboutsummaryrefslogtreecommitdiff
path: root/engines/access/amazon
diff options
context:
space:
mode:
authorStrangerke2014-12-14 23:51:01 +0100
committerStrangerke2014-12-14 23:51:01 +0100
commit66bf0ec7412949eee758c138be1f81571b1fc56d (patch)
tree2bc9479fdc389e25e947990d0a1ee8dea6c3b51e /engines/access/amazon
parentdcc6ceb117549a68a275b5740edea5e5e02030bd (diff)
downloadscummvm-rg350-66bf0ec7412949eee758c138be1f81571b1fc56d.tar.gz
scummvm-rg350-66bf0ec7412949eee758c138be1f81571b1fc56d.tar.bz2
scummvm-rg350-66bf0ec7412949eee758c138be1f81571b1fc56d.zip
ACCESS: Some refactoring concerning the mouse cursor
Diffstat (limited to 'engines/access/amazon')
-rw-r--r--engines/access/amazon/amazon_game.cpp2
-rw-r--r--engines/access/amazon/amazon_room.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 793a601d34..9a86642579 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -193,7 +193,7 @@ void AmazonEngine::initVariables() {
_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
_player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1];
_room->_selectCommand = -1;
- _events->_normalMouse = CURSOR_CROSSHAIRS;
+ _events->setNormalCursor(CURSOR_CROSSHAIRS);
_mouseMode = 0;
_numAnimTimers = 0;
}
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index d6ab2bd758..10b622c738 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -87,7 +87,7 @@ void AmazonRoom::reloadRoom1() {
}
_selectCommand = -1;
- _vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
+ _vm->_events->setNormalCursor(CURSOR_CROSSHAIRS);
_vm->_mouseMode = 0;
_vm->_boxSelect = true;
_vm->_player->_playerOff = false;
@@ -210,8 +210,7 @@ void AmazonRoom::walkCursor() {
if (_vm->_events->_middleButton || (_vm->_player->_roomNumber == 29 &&
events._normalMouse != CURSOR_CROSSHAIRS)) {
- events._normalMouse = CURSOR_CROSSHAIRS;
- events.setCursor(CURSOR_CROSSHAIRS);
+ events.forceSetCursor(CURSOR_CROSSHAIRS);
_selectCommand = -1;
_vm->_boxSelect = true;
} else {