aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/movesens.cpp
diff options
context:
space:
mode:
authorStrangerke2016-09-25 22:33:40 +0200
committerStrangerke2016-09-25 22:33:40 +0200
commite114e9a47fd21f45c1193328124be7542c3be111 (patch)
tree50c9d44b794ab24cb35636ab25bd0637938221a4 /engines/dm/movesens.cpp
parent804c6ab7130ac88ad66e2424f79f9cc48c0689f1 (diff)
downloadscummvm-rg350-e114e9a47fd21f45c1193328124be7542c3be111.tar.gz
scummvm-rg350-e114e9a47fd21f45c1193328124be7542c3be111.tar.bz2
scummvm-rg350-e114e9a47fd21f45c1193328124be7542c3be111.zip
DM: Some more work on dereferencing
Diffstat (limited to 'engines/dm/movesens.cpp')
-rw-r--r--engines/dm/movesens.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp
index eeafc4d951..3fb477cbbc 100644
--- a/engines/dm/movesens.cpp
+++ b/engines/dm/movesens.cpp
@@ -210,6 +210,7 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destMapX, int16 destMapY) {
DungeonMan &dungeon = *_vm->_dungeonMan;
+ DisplayMan &display = *_vm->_displayMan;
ThingType thingType = kDMThingTypeParty;
int16 traversedPitCount = 0;
@@ -311,12 +312,12 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
drawDungeonViewWhileFalling = true;
if (traversedPitCount) {
dungeon.setCurrentMapAndPartyMap(mapIndexDestination);
- _vm->_displayMan->loadCurrentMapGraphics();
+ display.loadCurrentMapGraphics();
}
traversedPitCount++;
- _vm->_displayMan->drawDungeon(dungeon._partyDir, destMapX, destMapY); /* BUG0_28 When falling through multiple pits the dungeon view is updated to show each traversed map but the graphics used for creatures, wall and floor ornaments may not be correct. The dungeon view is drawn for each map by using the graphics loaded for the source map. Therefore the graphics for creatures, wall and floor ornaments may not look like what they should */
- /* BUG0_71 Some timings are too short on fast computers. When the party falls in a series of pits, the dungeon view is refreshed too quickly because the execution speed is not limited */
- /* BUG0_01 While drawing creatures the engine will read invalid ACTIVE_GROUP data in _vm->_groupMan->_g375_activeGroups because the data is for the creatures on the source map and not the map being drawn. The only consequence is that creatures may be drawn with incorrect bitmaps and/or directions */
+ display.drawDungeon(dungeon._partyDir, destMapX, destMapY); /* BUG0_28 When falling through multiple pits the dungeon view is updated to show each traversed map but the graphics used for creatures, wall and floor ornaments may not be correct. The dungeon view is drawn for each map by using the graphics loaded for the source map. Therefore the graphics for creatures, wall and floor ornaments may not look like what they should */
+ /* BUG0_71 Some timings are too short on fast computers. When the party falls in a series of pits, the dungeon view is refreshed too quickly because the execution speed is not limited */
+ /* BUG0_01 While drawing creatures the engine will read invalid ACTIVE_GROUP data in _vm->_groupMan->_g375_activeGroups because the data is for the creatures on the source map and not the map being drawn. The only consequence is that creatures may be drawn with incorrect bitmaps and/or directions */
}
mapIndexDestination = dungeon.getLocationAfterLevelChange(mapIndexDestination, 1, &destMapX, &destMapY);
dungeon.setCurrentMap(mapIndexDestination);