diff options
| author | Strangerke | 2016-09-19 21:45:14 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-19 21:52:37 +0200 |
| commit | 706b1b27a4bba85cff87daddf7901e9428d6177c (patch) | |
| tree | 3ae56e140a935b3227c72ed949984793bce29c01 /engines/dm/dm.cpp | |
| parent | a60558071d0c6ffec9d099571fd1daff9e735532 (diff) | |
| download | scummvm-rg350-706b1b27a4bba85cff87daddf7901e9428d6177c.tar.gz scummvm-rg350-706b1b27a4bba85cff87daddf7901e9428d6177c.tar.bz2 scummvm-rg350-706b1b27a4bba85cff87daddf7901e9428d6177c.zip | |
DM: Fix 2 GCC warnings, some renaming
Diffstat (limited to 'engines/dm/dm.cpp')
| -rw-r--r-- | engines/dm/dm.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp index dbf7e8568d..4029c5ea9c 100644 --- a/engines/dm/dm.cpp +++ b/engines/dm/dm.cpp @@ -137,7 +137,7 @@ DMEngine::DMEngine(OSystem *syst, const DMADGameDescription *desc) : Engine(syst _engineShouldQuit = false; _dungeonId = 0; - _gameMode = k0_modeLoadSavedGame; + _gameMode = kDMModeLoadSavedGame; _restartGameRequest = false; _stopWaitingForPlayerInput = true; _gameTimeTicking = false; @@ -205,7 +205,7 @@ Common::Error DMEngine::loadGameState(int slot) { if (loadgame(slot) != kDMLoadgameFailure) { _displayMan->fillScreen(kDMColorBlack); _displayMan->startEndFadeToPalette(_displayMan->_palDungeonView[0]); - _gameMode = k0_modeLoadSavedGame; + _gameMode = kDMModeLoadSavedGame; startGame(); _restartGameRequest = false; @@ -259,7 +259,7 @@ void DMEngine::initializeGame() { if (_engineShouldQuit) return; - if (_gameMode == k0_modeLoadSavedGame) { // if resume was clicked, bring up ScummVM load screen + if (_gameMode == kDMModeLoadSavedGame) { // if resume was clicked, bring up ScummVM load screen GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser(_("Restore game:"), _("Restore"), false); saveSlot = dialog->runModalWithCurrentTarget(); delete dialog; @@ -273,7 +273,7 @@ void DMEngine::initializeGame() { _displayMan->allocateFlippedWallBitmaps(); startGame(); - if (_gameMode != k0_modeLoadSavedGame) + if (_gameMode != kDMModeLoadSavedGame) _moveSens->getMoveResult(Thing::_party, kDMMapXNotOnASquare, 0, _dungeonMan->_partyMapX, _dungeonMan->_partyMapY); _eventMan->showMouse(); _eventMan->discardAllInput(); @@ -312,7 +312,7 @@ void DMEngine::startGame() { processNewPartyMap(_dungeonMan->_partyMapIndex); - if (_gameMode == k0_modeLoadSavedGame) { + if (_gameMode == kDMModeLoadSavedGame) { _displayMan->startEndFadeToPalette(_displayMan->_paletteTopAndBottomScreen); _displayMan->_useByteBoxCoordinates = false; delay(1); @@ -535,21 +535,21 @@ void DMEngine::processEntrance() { drawEntrance(); _eventMan->showMouse(); _eventMan->discardAllInput(); - _gameMode = k99_modeWaitingOnEntrance; + _gameMode = kDMModeWaitingOnEntrance; do { _eventMan->processInput(); if (_engineShouldQuit) return; _eventMan->processCommandQueue(); _displayMan->updateScreen(); - } while (_gameMode == k99_modeWaitingOnEntrance); - } while (_gameMode == kDMCommandEntranceDrawCredits); + } while (_gameMode == kDMModeWaitingOnEntrance); + } while (_gameMode == kDMModeEntranceDrawCredits); //Strangerke: CHECKME: Earlier versions were using G0566_puc_Graphic534_Sound01Switch _sound->play(kDMSoundIndexSwitch, 112, 0x40, 0x40); delay(20); _eventMan->showMouse(); - if (_gameMode != k0_modeLoadSavedGame) + if (_gameMode != kDMModeLoadSavedGame) openEntranceDoors(); delete[] _entranceDoorAnimSteps[0]; @@ -701,7 +701,7 @@ T0444017: _displayMan->startEndFadeToPalette(darkBluePalette); _displayMan->fillScreen(kDMColorBlack); _displayMan->startEndFadeToPalette(_displayMan->_palDungeonView[0]); - _gameMode = k0_modeLoadSavedGame; + _gameMode = kDMModeLoadSavedGame; if (loadgame(1) != kDMLoadgameFailure) { startGame(); _restartGameRequest = false; @@ -891,7 +891,7 @@ void DMEngine::entranceDrawCredits() { _displayMan->startEndFadeToPalette(_displayMan->_palCredits); delay(50); _eventMan->waitForMouseOrKeyActivity(); - _gameMode = k202_modeEntranceDrawCredits; + _gameMode = kDMModeEntranceDrawCredits; } void DMEngine::fuseSequence() { |