[Scummvm-git-logs] scummvm master -> fe88ea1092fb56b964a3261047cfb9a5e3263c6b

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fe88ea1092 XEEN: Draw proper sky tiles outside bounds of sky maps


Commit: fe88ea1092fb56b964a3261047cfb9a5e3263c6b
    https://github.com/scummvm/scummvm/commit/fe88ea1092fb56b964a3261047cfb9a5e3263c6b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-04T22:45:52-04:00

Commit Message:
XEEN: Draw proper sky tiles outside bounds of sky maps

Changed paths:
    engines/xeen/map.cpp


diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index a89918a..24a10bf 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -1225,7 +1225,8 @@ void Map::setWall(const Common::Point &pt, Direction dir, int v) {
 }
 
 int Map::getCell(int idx) {
-	int mapId = _vm->_party->_mazeId;
+	Party &party = *g_vm->_party;
+	int mapId = party._mazeId;
 	Direction dir = _vm->_party->_mazeDirection;
 	Common::Point pt(
 		_vm->_party->_mazePosition.x + Res.SCREEN_POSITIONING_X[_vm->_party->_mazeDirection][idx],
@@ -1259,6 +1260,8 @@ int Map::getCell(int idx) {
 		}
 
 		if (!mapId) {
+			mapId = party._mazeId;
+
 			if (_isOutdoors) {
 				_currentSurfaceId = SURFTYPE_SPACE;
 				_currentWall = 0;
@@ -1293,6 +1296,8 @@ int Map::getCell(int idx) {
 		}
 
 		if (!mapId) {
+			mapId = party._mazeId;
+
 			if (_isOutdoors) {
 				_currentSurfaceId = SURFTYPE_SPACE;
 				_currentWall = 0;