XEEN: Moved _openDoor into InterfaceMap

5 files changed, 6 insertions, 6 deletions

diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index cac9f3a62d..11fc3127cf 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -934,10 +934,10 @@ bool Interface::checkMoveDirection(int key) {
 				return false;
 			} else {
 				if (_buttonValue == Common::KEYCODE_UP && _wo[107]) {
-					_vm->_openDoor = true;
+					_openDoor = true;
 					sound.playFX(47);
 					draw3d(true);
-					_vm->_openDoor = false;
+					_openDoor = false;
 				}
 				return true;
 			}
diff --git a/engines/xeen/interface_map.cpp b/engines/xeen/interface_map.cpp
index 6f4f708382..a3241a133f 100644
--- a/engines/xeen/interface_map.cpp
+++ b/engines/xeen/interface_map.cpp
@@ -383,6 +383,7 @@ InterfaceMap::InterfaceMap(XeenEngine *vm): _vm(vm) {
 	_isAnimReset = false;
 	_flag1 = false;
 	_overallFrame = 0;
+	_openDoor = false;
 }
 
 void InterfaceMap::drawMap() {
@@ -4243,7 +4244,7 @@ void InterfaceMap::drawIndoors() {
 
 	if (_wo[107]) {
 		_indoorList._fwl_1F1R._sprites = &map._wallSprites._fwl2;
-		if (!_vm->_openDoor)
+		if (!_openDoor)
 			_indoorList._fwl_1F1R._frame = 0;
 		else
 			_indoorList._fwl_1F1R._frame = map.mazeData()._wallKind ? 1 : 10;
@@ -4303,7 +4304,7 @@ void InterfaceMap::drawIndoors() {
 	_indoorList[0]._sprites = &map._skySprites[map._currentSky];
 	_indoorList[0]._flags = _flipSky ? SPRFLAG_HORIZ_FLIPPED : 0;
 
-	if (_vm->_openDoor) {
+	if (_openDoor) {
 		Common::Point pt(
 			_vm->_party->_mazePosition.x + SCREEN_POSITIONING_X[
 				_vm->_party->_mazeDirection][_vm->_party->_mazePosition.x],
diff --git a/engines/xeen/interface_map.h b/engines/xeen/interface_map.h
index 761e99760c..1ff982972f 100644
--- a/engines/xeen/interface_map.h
+++ b/engines/xeen/interface_map.h
@@ -121,6 +121,7 @@ public:
 	int _objNumber;
 	int _overallFrame;
 	bool _charsShooting;
+	bool _openDoor;
 public:
 	InterfaceMap(XeenEngine *vm);
 
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index e0a2bebacd..a3240bf8b5 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -56,7 +56,6 @@ XeenEngine::XeenEngine(OSystem *syst, const XeenGameDescription *gameDesc)
 	_noDirectionSense = false;
 	_moveMonsters = false;
 	_mode = MODE_0;
-	_openDoor = 0;
 	_startupWindowActive = false;
 }
 
diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h
index 2d85335ced..d0a72f5868 100644
--- a/engines/xeen/xeen.h
+++ b/engines/xeen/xeen.h
@@ -157,7 +157,6 @@ public:
 	bool _dangerSenseAllowed;
 	bool _noDirectionSense;
 	bool _moveMonsters;
-	int _openDoor;
 	bool _startupWindowActive;
 public:
 	XeenEngine(OSystem *syst, const XeenGameDescription *gameDesc);