aboutsummaryrefslogtreecommitdiff
path: root/engines/wage/combat.cpp
diff options
context:
space:
mode:
authorD G Turner2019-10-23 03:31:46 +0100
committerD G Turner2019-10-23 03:31:46 +0100
commitfe3eae346e67daa7e94098205636b6896e42f1c1 (patch)
tree067814d34dde66def3a9dd4265319a419f098b9f /engines/wage/combat.cpp
parent56191eded6893a83edf1f01d01f23c50d43d7f92 (diff)
downloadscummvm-rg350-fe3eae346e67daa7e94098205636b6896e42f1c1.tar.gz
scummvm-rg350-fe3eae346e67daa7e94098205636b6896e42f1c1.tar.bz2
scummvm-rg350-fe3eae346e67daa7e94098205636b6896e42f1c1.zip
WAGE: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/wage/combat.cpp')
-rw-r--r--engines/wage/combat.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp
index e8f0c8dfab..67e682ff17 100644
--- a/engines/wage/combat.cpp
+++ b/engines/wage/combat.cpp
@@ -349,10 +349,11 @@ void WageEngine::performMagic(Chr *attacker, Chr *victim, Obj *magicalObject) {
case Obj::HEALS_SPIRITUAL_DAMAGE:
case Obj::HEALS_PHYSICAL_AND_SPIRITUAL_DAMAGE:
performHealingMagic(attacker, magicalObject);
- return;
+ break;
+ default:
+ performAttack(attacker, victim, magicalObject);
+ break;
}
-
- performAttack(attacker, victim, magicalObject);
}
void WageEngine::performHealingMagic(Chr *chr, Obj *magicalObject) {
@@ -873,6 +874,8 @@ bool WageEngine::handleAttack(Obj *weapon) {
case Obj::HEALS_SPIRITUAL_DAMAGE:
performMagic(player, enemy, weapon);
return true;
+ default:
+ break;
}
}
if (enemy != NULL)