[Scummvm-git-logs] scummvm master -> 8c157042832c0f5779155884494e4978de054457

[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:
8c15704283 ULTIMA4: Fix saving of dungeon monsters & chests


Commit: 8c157042832c0f5779155884494e4978de054457
    https://github.com/scummvm/scummvm/commit/8c157042832c0f5779155884494e4978de054457
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-13T20:15:42-07:00

Commit Message:
ULTIMA4: Fix saving of dungeon monsters & chests

Changed paths:
    engines/ultima/ultima4/map/map.cpp


diff --git a/engines/ultima/ultima4/map/map.cpp b/engines/ultima/ultima4/map/map.cpp
index a097b5e0e0..3f8b5d7047 100644
--- a/engines/ultima/ultima4/map/map.cpp
+++ b/engines/ultima/ultima4/map/map.cpp
@@ -748,14 +748,15 @@ bool Map::fillMonsterTable() {
 	/**
 	 * Fill in our monster table
 	 */
+	TileMap *base = g_tileMaps->get("base");
 	for (i = 0; i < MONSTERTABLE_SIZE; i++) {
 		Coords c = monsters[i]->getCoords(),
-		       prevc = monsters[i]->getPrevCoords();
+			prevc = monsters[i]->getPrevCoords();
 
-		_monsterTable[i]._tile = translateToRawTileIndex(monsters[i]->getTile());
+		_monsterTable[i]._tile = base->untranslate(monsters[i]->getTile());
 		_monsterTable[i]._x = c.x;
 		_monsterTable[i]._y = c.y;
-		_monsterTable[i]._prevTile = translateToRawTileIndex(monsters[i]->getPrevTile());
+		_monsterTable[i]._prevTile = base->untranslate(monsters[i]->getPrevTile());
 		_monsterTable[i]._prevX = prevc.x;
 		_monsterTable[i]._prevY = prevc.y;
 	}