[Scummvm-git-logs] scummvm master -> 5447a13013a91f9b0f4ddf26c7a56cdec71eb59b

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5447a13013 XEEN: Fix Missing Default Switch Cases


Commit: 5447a13013a91f9b0f4ddf26c7a56cdec71eb59b
    https://github.com/scummvm/scummvm/commit/5447a13013a91f9b0f4ddf26c7a56cdec71eb59b
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-09T01:03:55Z

Commit Message:
XEEN: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.

Changed paths:
    engines/xeen/combat.cpp
    engines/xeen/dialogs/dialogs_char_info.cpp
    engines/xeen/dialogs/dialogs_items.cpp
    engines/xeen/dialogs/dialogs_quests.cpp
    engines/xeen/dialogs/dialogs_spells.cpp
    engines/xeen/interface.cpp
    engines/xeen/locations.cpp
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 2dca3b0..3303c17 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 3923caf..66d28b6 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 805bfd0..da3b9cb 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 94834c1..0f2601a 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 27329e4..2c92203 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 29dcce4..692dad7 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 7ebdce3..15cd6a8 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 a781086..4b172bd 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;
 					}