diff options
| author | Bendegúz Nagy | 2016-07-02 01:55:48 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 71e4b5b2bca49f0de8b07f4f85de9167dd9b5f99 (patch) | |
| tree | 9e656c1c3af8a90ab7e631528bfa2669c13862a8 /engines/dm/dm.cpp | |
| parent | da317f14be4d2b6f1031d84b5fc7ee743998cf4c (diff) | |
| download | scummvm-rg350-71e4b5b2bca49f0de8b07f4f85de9167dd9b5f99.tar.gz scummvm-rg350-71e4b5b2bca49f0de8b07f4f85de9167dd9b5f99.tar.bz2 scummvm-rg350-71e4b5b2bca49f0de8b07f4f85de9167dd9b5f99.zip | |
DM: Renaming in champion.c/h
Diffstat (limited to 'engines/dm/dm.cpp')
| -rw-r--r-- | engines/dm/dm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp index bf584fd6fe..adc842b0ab 100644 --- a/engines/dm/dm.cpp +++ b/engines/dm/dm.cpp @@ -170,10 +170,10 @@ void DMEngine::startGame() { _stopPressingMouth = false; _highlightBoxInversionRequested = false; _eventMan->_highlightBoxEnabled = false; - _championMan->_partyIsSleeping = false; - _championMan->_actingChampionOrdinal = indexToOrdinal(kChampionNone); + _championMan->_g300_partyIsSleeping = false; + _championMan->_g506_actingChampionOrdinal = indexToOrdinal(kM1_ChampionNone); _menuMan->_actionAreaContainsIcons = true; - _eventMan->_useChampionIconOrdinalAsMousePointerBitmap = indexToOrdinal(kChampionNone); + _eventMan->_useChampionIconOrdinalAsMousePointerBitmap = indexToOrdinal(kM1_ChampionNone); _eventMan->_primaryMouseInput = gPrimaryMouseInput_Interface; _eventMan->_secondaryMouseInput = gSecondaryMouseInput_Movement; @@ -251,7 +251,7 @@ void DMEngine::gameloop() { _eventMan->processCommandQueue(); //} while (!_stopWaitingForPlayerInput || !_gameTimeTicking); - if (!_inventoryMan->_inventoryChampionOrdinal && !_championMan->_partyIsSleeping) { + if (!_inventoryMan->_inventoryChampionOrdinal && !_championMan->_g300_partyIsSleeping) { Box box(0, 224, 0, 126); _displayMan->clearScreenBox(k0_ColorBlack, box, g296_DungeonViewport); // dummy code _displayMan->drawDungeon(_dungeonMan->_currMap._partyDir, _dungeonMan->_currMap._partyPosX, _dungeonMan->_currMap._partyPosY); |