diff options
| author | Strangerke | 2016-09-07 22:21:01 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-07 22:21:01 +0200 |
| commit | 4703c6e7991349fa06638076d6a9a37d6cf2d3a5 (patch) | |
| tree | 611e9ad8e808740b4c1f231838ec1a2e66dae987 | |
| parent | 6e412c6a8baf127d7cb7624c4b6b2f67765a7d22 (diff) | |
| download | scummvm-rg350-4703c6e7991349fa06638076d6a9a37d6cf2d3a5.tar.gz scummvm-rg350-4703c6e7991349fa06638076d6a9a37d6cf2d3a5.tar.bz2 scummvm-rg350-4703c6e7991349fa06638076d6a9a37d6cf2d3a5.zip | |
DM: Remove GOTOs from processTimeline()
| -rw-r--r-- | engines/dm/timeline.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index 5fc07b4a50..558ecc8cd7 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -315,10 +315,11 @@ void Timeline::processTimeline() { break; case k11_TMEventTypeEnableChampionAction: processEventEnableChampionAction(newEvent._priority); - if (newEvent._B._slotOrdinal) { + if (newEvent._B._slotOrdinal) processEventMoveWeaponFromQuiverToSlot(newEvent._priority, _vm->ordinalToIndex(newEvent._B._slotOrdinal)); - } - goto T0261048; + + _vm->_championMan->drawChampionState((ChampionIndex)newEvent._priority); + break; case k12_TMEventTypeHideDamageReceived: processEventHideDamageReceived(newEvent._priority); break; @@ -333,7 +334,6 @@ void Timeline::processTimeline() { case k72_TMEventTypeChampionShield: _vm->_championMan->_champions[newEvent._priority]._shieldDefense -= newEvent._B._defense; setFlag(_vm->_championMan->_champions[newEvent._priority]._attributes, k0x1000_ChampionAttributeStatusBox); -T0261048: _vm->_championMan->drawChampionState((ChampionIndex)newEvent._priority); break; case k73_TMEventTypeThievesEye: @@ -341,15 +341,16 @@ T0261048: break; case k74_TMEventTypePartyShield: _vm->_championMan->_party._shieldDefense -= newEvent._B._defense; -T0261053: refreshAllChampionStatusBoxes(); break; case k77_TMEventTypeSpellShield: _vm->_championMan->_party._spellShieldDefense -= newEvent._B._defense; - goto T0261053; + refreshAllChampionStatusBoxes(); + break; case k78_TMEventTypeFireShield: _vm->_championMan->_party._fireShieldDefense -= newEvent._B._defense; - goto T0261053; + refreshAllChampionStatusBoxes(); + break; case k75_TMEventTypePoisonChampion: { uint16 championIndex = newEvent._priority; _vm->_championMan->_champions[championIndex = newEvent._priority]._poisonEventCount--; |