aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-11-02 16:28:06 -0500
committerPaul Gilbert2014-12-12 22:21:35 -0500
commite46c0ac66a1fc94439264e4a07bbc92b09c03c07 (patch)
tree79e616b7be5a1342cedd759df91e88181f1ac157 /engines
parent958dd0b77bb7becc489d717806bbb96734901217 (diff)
downloadscummvm-rg350-e46c0ac66a1fc94439264e4a07bbc92b09c03c07.tar.gz
scummvm-rg350-e46c0ac66a1fc94439264e4a07bbc92b09c03c07.tar.bz2
scummvm-rg350-e46c0ac66a1fc94439264e4a07bbc92b09c03c07.zip
ACCESS: Fix resetting cursor after conversations
Diffstat (limited to 'engines')
-rw-r--r--engines/access/access.cpp1
-rw-r--r--engines/access/access.h1
-rw-r--r--engines/access/amazon/amazon_room.cpp2
-rw-r--r--engines/access/martian/martian_room.cpp2
4 files changed, 2 insertions, 4 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index fab66c3b6c..a3cadc1025 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -51,7 +51,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
_destIn = nullptr;
_current = nullptr;
_pCount = 0;
- _normalMouse = true;
_mouseMode = 0;
_currentMan = 0;
_currentManOld = -1;
diff --git a/engines/access/access.h b/engines/access/access.h
index fcac69d56e..36951c7504 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -172,7 +172,6 @@ public:
Common::Array<ExtraCell> _extraCells;
ImageEntryList _images;
int _pCount;
- bool _normalMouse;
int _mouseMode;
int _currentManOld;
diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp
index 39cea9ae62..098220ee0c 100644
--- a/engines/access/amazon/amazon_room.cpp
+++ b/engines/access/amazon/amazon_room.cpp
@@ -84,7 +84,7 @@ void AmazonRoom::reloadRoom1() {
}
_selectCommand = -1;
- _vm->_normalMouse = 1;
+ _vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
_vm->_mouseMode = 0;
_vm->_boxSelect = true;
_vm->_player->_playerOff = false;
diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp
index e624b0abd5..6d4d62f7e9 100644
--- a/engines/access/martian/martian_room.cpp
+++ b/engines/access/martian/martian_room.cpp
@@ -82,7 +82,7 @@ void MartianRoom::reloadRoom1() {
}
_selectCommand = -1;
- _vm->_normalMouse = 1;
+ _vm->_events->_normalMouse = CURSOR_CROSSHAIRS;
_vm->_mouseMode = 0;
_vm->_boxSelect = true;
_vm->_player->_playerOff = false;