aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/dm.cpp
diff options
context:
space:
mode:
authorBendegúz Nagy2016-07-02 13:47:19 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit46b9b1100ef315e4a29edda864204a2e74e9f725 (patch)
tree1dcdc2b82117ec2e1b6aab3c7e85d9901ab5c031 /engines/dm/dm.cpp
parent63ff1666d693b0078e5b6fd603240e9453c11918 (diff)
downloadscummvm-rg350-46b9b1100ef315e4a29edda864204a2e74e9f725.tar.gz
scummvm-rg350-46b9b1100ef315e4a29edda864204a2e74e9f725.tar.bz2
scummvm-rg350-46b9b1100ef315e4a29edda864204a2e74e9f725.zip
DM: Refactor DungeonMan
Diffstat (limited to 'engines/dm/dm.cpp')
-rw-r--r--engines/dm/dm.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index 5c854d5209..a32f059f7b 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -179,9 +179,9 @@ void DMEngine::startGame() {
_eventMan->_g442_secondaryMouseInput = g448_SecondaryMouseInput_Movement;
warning("MISSING CODE: set primary/secondary keyboard input");
- processNewPartyMap(_dungeonMan->_currMap._g309_currPartyMapIndex);
+ processNewPartyMap(_dungeonMan->_g309_partyMapIndex);
- if (!_dungeonMan->_messages._g298_newGame) {
+ if (!_g298_newGame) {
warning("TODO: loading game");
} else {
_displayMan->_g578_useByteBoxCoordinates = false;
@@ -233,9 +233,9 @@ Common::Error DMEngine::run() {
void DMEngine::gameloop() {
warning("DUMMY CODE SETTING PARTY POS AND DIRECTION");
- _dungeonMan->_currMap._g306_partyPosX = 10;
- _dungeonMan->_currMap._g307_partyPosY = 4;
- _dungeonMan->_currMap._g308_partyDir = kDirNorth;
+ _dungeonMan->_g306_partyMapX = 10;
+ _dungeonMan->_g307_partyMapY = 4;
+ _dungeonMan->_g308_partyDir = kDirNorth;
warning("DUMMY CODE: setting InventoryMan::_g432_inventoryChampionOrdinal to zero");
@@ -254,7 +254,7 @@ void DMEngine::gameloop() {
if (!_inventoryMan->_g432_inventoryChampionOrdinal && !_championMan->_g300_partyIsSleeping) {
Box box(0, 224, 0, 126);
_displayMan->clearScreenBox(k0_ColorBlack, box, g296_DungeonViewport); // dummy code
- _displayMan->drawDungeon(_dungeonMan->_currMap._g308_partyDir, _dungeonMan->_currMap._g306_partyPosX, _dungeonMan->_currMap._g307_partyPosY);
+ _displayMan->drawDungeon(_dungeonMan->_g308_partyDir, _dungeonMan->_g306_partyMapX, _dungeonMan->_g307_partyMapY);
}
// DUMMY CODE: next line
_menuMan->drawMovementArrows();