diff options
| author | D G Turner | 2019-10-23 03:31:46 +0100 |
|---|---|---|
| committer | D G Turner | 2019-10-23 03:31:46 +0100 |
| commit | fe3eae346e67daa7e94098205636b6896e42f1c1 (patch) | |
| tree | 067814d34dde66def3a9dd4265319a419f098b9f /engines | |
| parent | 56191eded6893a83edf1f01d01f23c50d43d7f92 (diff) | |
| download | scummvm-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')
| -rw-r--r-- | engines/wage/combat.cpp | 9 | ||||
| -rw-r--r-- | engines/wage/script.cpp | 8 | ||||
| -rw-r--r-- | engines/wage/util.cpp | 2 |
3 files changed, 14 insertions, 5 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) diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp index 558f493847..3b20e965cc 100644 --- a/engines/wage/script.cpp +++ b/engines/wage/script.cpp @@ -621,8 +621,10 @@ void Script::skipBlock() { case 0x8C: // SOUND case 0x8E: // LET case 0x95: // MENU - while (_data->readByte() != 0xFD) - ; + while (_data->readByte() != 0xFD); + break; + default: + break; } } } @@ -801,6 +803,8 @@ bool Script::compare(Operand *o1, Operand *o2, int comparator) { _world->move(o1->_value.chr, o2->_value.scene); _handled = true; // TODO: Is this correct? break; + default: + break; } return false; diff --git a/engines/wage/util.cpp b/engines/wage/util.cpp index 74f2cf5c18..4f85612bd3 100644 --- a/engines/wage/util.cpp +++ b/engines/wage/util.cpp @@ -84,6 +84,8 @@ const char *getIndefiniteArticle(const Common::String &word) { case 'o': case 'O': case 'u': case 'U': return "an "; + default: + break; } return "a "; } |