diff options
| author | Strangerke | 2016-09-11 10:45:20 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-11 10:45:20 +0200 |
| commit | b17f3490f84bb7342d240f31e884984c38110425 (patch) | |
| tree | c17f99e46b7dc922e5a193951c0166fa8c4fba4f /engines/dm/menus.cpp | |
| parent | f0a6f6b269fb121affa252e36d23c895c7d32e4e (diff) | |
| download | scummvm-rg350-b17f3490f84bb7342d240f31e884984c38110425.tar.gz scummvm-rg350-b17f3490f84bb7342d240f31e884984c38110425.tar.bz2 scummvm-rg350-b17f3490f84bb7342d240f31e884984c38110425.zip | |
DM: Rework functions related to Directions in order to make them consistent and remove redundancy
Diffstat (limited to 'engines/dm/menus.cpp')
| -rw-r--r-- | engines/dm/menus.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index 5e83cbc593..34cbd7e14b 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -894,7 +894,7 @@ void MenuMan::addChampionSymbol(int16 symbolIndex) { setFlag(casterChampion->_attributes, kDMAttributeStatistics); casterChampion->_symbols[symbolStep] = 96 + (symbolStep * 6) + symbolIndex; casterChampion->_symbols[symbolStep + 1] = '\0'; - casterChampion->_symbolStep = symbolStep = _vm->returnNextVal(symbolStep); + casterChampion->_symbolStep = symbolStep = _vm->turnDirRight(symbolStep); _vm->_eventMan->showMouse(); drawAvailableSymbols(symbolStep); drawChampionSymbols(casterChampion); @@ -908,7 +908,7 @@ void MenuMan::deleteChampionSymbol() { if (!strlen(casterChampion->_symbols)) return; - int16 symbolStep = _vm->returnPrevVal(casterChampion->_symbolStep); + int16 symbolStep = _vm->turnDirLeft(casterChampion->_symbolStep); casterChampion->_symbolStep = symbolStep; casterChampion->_symbols[symbolStep] = '\0'; _vm->_eventMan->showMouse(); @@ -1308,7 +1308,7 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { break; case kDMActionThrow: setChampionDirectionToPartyDirection(curChampion); - actionPerformed = _vm->_championMan->isObjectThrown(champIndex, kDMSlotActionHand, (curChampion->_cell == _vm->returnNextVal(_vm->_dungeonMan->_partyDir)) || (curChampion->_cell == (ViewCell)_vm->returnOppositeDir(_vm->_dungeonMan->_partyDir))); + actionPerformed = _vm->_championMan->isObjectThrown(champIndex, kDMSlotActionHand, (curChampion->_cell == _vm->turnDirRight(_vm->_dungeonMan->_partyDir)) || (curChampion->_cell == (ViewCell)_vm->returnOppositeDir(_vm->_dungeonMan->_partyDir))); if (actionPerformed) _vm->_timeline->_events[curChampion->_enableActionEventIndex]._Bu._slotOrdinal = _vm->indexToOrdinal(kDMSlotActionHand); break; |