ACCESS: Fix resetting cursor after conversations

scummvm · Dec 13, 2014 · e46c0ac · e46c0ac
1 parent 958dd0b
commit e46c0ac
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -172,7 +172,6 @@ class AccessEngine : public Engine {
 	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
@@ -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
@@ -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;