diff options
author | Bendegúz Nagy | 2016-07-15 16:15:48 +0200 |
---|---|---|
committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
commit | ac1b49496d13f173bc08274808b1c1878e743a11 (patch) | |
tree | 1fd163421a8b5ed1edee360b484e7203d22fca5a | |
parent | 247b9210e1280aef243000b954e880054b4cfaa0 (diff) | |
download | scummvm-rg350-ac1b49496d13f173bc08274808b1c1878e743a11.tar.gz scummvm-rg350-ac1b49496d13f173bc08274808b1c1878e743a11.tar.bz2 scummvm-rg350-ac1b49496d13f173bc08274808b1c1878e743a11.zip |
DM: Fix setting _g309_partyMapIndex when moving between levels
-rw-r--r-- | engines/dm/TODOs/todo.txt | 2 | ||||
-rw-r--r-- | engines/dm/dungeonman.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/dm/TODOs/todo.txt b/engines/dm/TODOs/todo.txt index 5dd2caf8bf..d49ec2209f 100644 --- a/engines/dm/TODOs/todo.txt +++ b/engines/dm/TODOs/todo.txt @@ -11,7 +11,7 @@ Bugs: Sometimes putting stuff in the player's hand segfaults Footprints are everywhere Object display is a bit mixed up with regards to which cell is it drawn in - Taking the stairs teleports the player to the wrong position + Activegroup index segfaults when aknig the stairs Possible bugs: diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp index 3d1f931edb..063ccd0388 100644 --- a/engines/dm/dungeonman.cpp +++ b/engines/dm/dungeonman.cpp @@ -735,7 +735,7 @@ void DungeonMan::f173_setCurrentMap(uint16 mapIndex) { } void DungeonMan::f174_setCurrentMapAndPartyMap(uint16 mapIndex) { - f173_setCurrentMap(mapIndex); + f173_setCurrentMap(_g309_partyMapIndex = mapIndex); byte *metaMapData = _g271_currMapData[_g273_currMapWidth - 1] + _g274_currMapHeight; _vm->_displayMan->_g264_currMapAllowedCreatureTypes = metaMapData; |