From e46c0ac66a1fc94439264e4a07bbc92b09c03c07 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 2 Nov 2014 16:28:06 -0500
Subject: ACCESS: Fix resetting cursor after conversations

---
 engines/access/access.cpp               | 1 -
 engines/access/access.h                 | 1 -
 engines/access/amazon/amazon_room.cpp   | 2 +-
 engines/access/martian/martian_room.cpp | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines')

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;
-- 
cgit v1.2.3