diff options
| author | Bendegúz Nagy | 2016-07-02 13:47:19 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 46b9b1100ef315e4a29edda864204a2e74e9f725 (patch) | |
| tree | 1dcdc2b82117ec2e1b6aab3c7e85d9901ab5c031 /engines/dm/gfx.cpp | |
| parent | 63ff1666d693b0078e5b6fd603240e9453c11918 (diff) | |
| download | scummvm-rg350-46b9b1100ef315e4a29edda864204a2e74e9f725.tar.gz scummvm-rg350-46b9b1100ef315e4a29edda864204a2e74e9f725.tar.bz2 scummvm-rg350-46b9b1100ef315e4a29edda864204a2e74e9f725.zip | |
DM: Refactor DungeonMan
Diffstat (limited to 'engines/dm/gfx.cpp')
| -rw-r--r-- | engines/dm/gfx.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index 62bf070579..516c1d65bb 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -1155,7 +1155,7 @@ void DisplayMan::drawSquareD3R(direction dir, int16 posX, int16 posY) { cthulhu(Thing(squareAspect[k1_FirstGroupOrObjectAspect]), dir, posX, posY, k2_ViewSquare_D3R, k0x0128_CellOrder_DoorPass1_BackRight_BackLeft); memcpy(_g74_tmpBitmap, _wallSetBitMaps[kG705_DoorFrameLeft_D3L], 32 * 44); warning("MISSING CODE: F0103_DUNGEONVIEW_DrawDoorFrameBitmapFlippedHorizontally"); - if (((Door*)_vm->_dungeonMan->_dunData._g284_thingsData[k0_DoorThingType])[squareAspect[k3_DoorThingIndexAspect]].hasButton()) { + if (((Door*)_vm->_dungeonMan->_g284_thingData[k0_DoorThingType])[squareAspect[k3_DoorThingIndexAspect]].hasButton()) { warning("MISSING CODE: F0110_DUNGEONVIEW_DrawDoorButton"); } warning("MISSING CODE: F0111_DUNGEONVIEW_DrawDoor"); @@ -1519,13 +1519,13 @@ void DisplayMan::loadWallSet(WallSet set) { void DisplayMan::loadCurrentMapGraphics() { - loadFloorSet(_vm->_dungeonMan->_currMap._g269_map->_floorSet); - loadWallSet(_vm->_dungeonMan->_currMap._g269_map->_wallSet); + loadFloorSet(_vm->_dungeonMan->_g269_currMap->_floorSet); + loadWallSet(_vm->_dungeonMan->_g269_currMap->_wallSet); // the original loads some flipped walls here, I moved it to loadWallSet { - int16 val = _vm->_dungeonMan->_currMap._g269_map->_wallSet * k18_StairsGraphicCount + k90_FirstStairs; + int16 val = _vm->_dungeonMan->_g269_currMap->_wallSet * k18_StairsGraphicCount + k90_FirstStairs; _g675_stairsNativeBitmapIndex_Up_Front_D3L = val++; _g676_stairsNativeBitmapIndex_Up_Front_D3C = val++; _g677_stairsNativeBitmapIndex_Up_Front_D2L = val++; @@ -1556,7 +1556,7 @@ void DisplayMan::loadCurrentMapGraphics() { uint16 alcoveCount = 0; uint16 fountainCount = 0; - Map &currMap = *_vm->_dungeonMan->_currMap._g269_map; + Map &currMap = *_vm->_dungeonMan->_g269_currMap; _g266_currMapViAltarIndex = -1; |