aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen
diff options
context:
space:
mode:
authorD G Turner2019-11-09 01:03:55 +0000
committerD G Turner2019-11-09 01:03:55 +0000
commit5447a13013a91f9b0f4ddf26c7a56cdec71eb59b (patch)
tree9584b5572fb6eca1fd91ec495dd637991715c7fb /engines/xeen
parentb2452d6ffde98777353b2e2d9fcfd2de66d5a28b (diff)
downloadscummvm-rg350-5447a13013a91f9b0f4ddf26c7a56cdec71eb59b.tar.gz
scummvm-rg350-5447a13013a91f9b0f4ddf26c7a56cdec71eb59b.tar.bz2
scummvm-rg350-5447a13013a91f9b0f4ddf26c7a56cdec71eb59b.zip
XEEN: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/xeen')
-rw-r--r--engines/xeen/combat.cpp2
-rw-r--r--engines/xeen/dialogs/dialogs_char_info.cpp3
-rw-r--r--engines/xeen/dialogs/dialogs_items.cpp3
-rw-r--r--engines/xeen/dialogs/dialogs_quests.cpp3
-rw-r--r--engines/xeen/dialogs/dialogs_spells.cpp9
-rw-r--r--engines/xeen/interface.cpp3
-rw-r--r--engines/xeen/locations.cpp5
-rw-r--r--engines/xeen/scripts.cpp2
8 files changed, 30 insertions, 0 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 2dca3b0648..3303c170fe 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1551,6 +1551,8 @@ void Combat::attack2(int damage, RangeType rangeType) {
}
}
break;
+ default:
+ break;
}
}
}
diff --git a/engines/xeen/dialogs/dialogs_char_info.cpp b/engines/xeen/dialogs/dialogs_char_info.cpp
index 3923caf172..66d28b6dfd 100644
--- a/engines/xeen/dialogs/dialogs_char_info.cpp
+++ b/engines/xeen/dialogs/dialogs_char_info.cpp
@@ -208,6 +208,9 @@ void CharacterInfo::execute(int charIndex) {
case Common::KEYCODE_ESCAPE:
goto exit;
+
+ default:
+ break;
}
} while (!_vm->shouldExit());
exit:
diff --git a/engines/xeen/dialogs/dialogs_items.cpp b/engines/xeen/dialogs/dialogs_items.cpp
index 805bfd03d6..da3b9cb1ca 100644
--- a/engines/xeen/dialogs/dialogs_items.cpp
+++ b/engines/xeen/dialogs/dialogs_items.cpp
@@ -482,6 +482,9 @@ Character *ItemsDialog::execute(Character *c, ItemsMode mode) {
category = CATEGORY_WEAPON;
redrawFlag = REDRAW_FULL;
break;
+
+ default:
+ break;
}
}
diff --git a/engines/xeen/dialogs/dialogs_quests.cpp b/engines/xeen/dialogs/dialogs_quests.cpp
index 94834c1c02..0f2601a36e 100644
--- a/engines/xeen/dialogs/dialogs_quests.cpp
+++ b/engines/xeen/dialogs/dialogs_quests.cpp
@@ -204,6 +204,9 @@ void Quests::execute() {
));
break;
}
+
+ default:
+ break;
}
windows[30].writeString("\v000\t000");
diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index 27329e48df..2c92203622 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -238,6 +238,9 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
if (topIndex < ((int)_spells.size() - 10))
++topIndex;
break;
+
+ default:
+ break;
}
} while (!_vm->shouldExit() && _buttonValue != Common::KEYCODE_ESCAPE);
@@ -620,6 +623,9 @@ int SpellOnWho::execute(int spellId) {
result = _buttonValue;
}
break;
+
+ default:
+ break;
}
}
@@ -828,6 +834,9 @@ bool LloydsBeacon::execute() {
_buttonValue = Common::KEYCODE_ESCAPE;
break;
+
+ default:
+ break;
}
} while (_buttonValue != Common::KEYCODE_ESCAPE);
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 29dcce4ed0..692dad7d97 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1669,6 +1669,9 @@ void Interface::doCombat() {
combat.moveMonsters();
party._stepped = true;
break;
+
+ default:
+ break;
}
// Handling for if the combat turn is complete
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 7ebdce3f19..15cd6a8de4 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -1958,6 +1958,9 @@ int DwarfCutscene::show() {
case 2:
sound.playSound("dwarf12.voc");
break;
+
+ default:
+ break;
}
events.updateGameCounter();
@@ -2158,6 +2161,8 @@ int SphinxCutscene::show() {
case 2:
sound.playSound("sphinx12.voc");
break;
+ default:
+ break;
}
do {
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index a781086238..4b172bdd86 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -791,6 +791,8 @@ bool Scripts::cmdTakeOrGive(ParamsIterator &params) {
// Break out of character loop
idx = party._activeParty.size();
break;
+ default:
+ break;
}
break;
}