[Scummvm-git-logs] scummvm master -> d77e70a90238424028cce6da27646d40429b8a00

[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:
d77e70a902 KYRA: Fix Missing Default Switch Cases


Commit: d77e70a90238424028cce6da27646d40429b8a00
    https://github.com/scummvm/scummvm/commit/d77e70a90238424028cce6da27646d40429b8a00
Author: D G Turner (digitall at scummvm.org)
Date: 2019-12-06T04:31:04Z

Commit Message:
KYRA: Fix Missing Default Switch Cases

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

Changed paths:
    engines/kyra/engine/kyra_v1.cpp
    engines/kyra/engine/scene_mr.cpp
    engines/kyra/graphics/screen_eob.cpp
    engines/kyra/gui/gui_lok.cpp
    engines/kyra/gui/gui_lol.cpp
    engines/kyra/sequence/sequences_darkmoon.cpp
    engines/kyra/sequence/sequences_eob.cpp
    engines/kyra/sequence/sequences_hof.cpp
    engines/kyra/sequence/sequences_lok.cpp
    engines/kyra/text/text_lok.cpp


diff --git a/engines/kyra/engine/kyra_v1.cpp b/engines/kyra/engine/kyra_v1.cpp
index 7b93851..4f8296c 100644
--- a/engines/kyra/engine/kyra_v1.cpp
+++ b/engines/kyra/engine/kyra_v1.cpp
@@ -655,6 +655,9 @@ void KyraEngine_v1::setVolume(kVolumeEntry vol, uint8 value) {
 	case kVolumeSpeech:
 		ConfMan.setInt("speech_volume", convertVolumeToMixer(value));
 		break;
+
+	default:
+		break;
 	}
 
 	// Resetup mixer
@@ -679,6 +682,9 @@ uint8 KyraEngine_v1::getVolume(kVolumeEntry vol) {
 		else
 			return 2;
 		break;
+
+	default:
+		break;
 	}
 
 	return 2;
diff --git a/engines/kyra/engine/scene_mr.cpp b/engines/kyra/engine/scene_mr.cpp
index ea0e69e..97920e3 100644
--- a/engines/kyra/engine/scene_mr.cpp
+++ b/engines/kyra/engine/scene_mr.cpp
@@ -62,6 +62,9 @@ void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2
 		case 6:
 			x = -24;
 			break;
+
+		default:
+			break;
 		}
 
 		moveCharacter(facing, x, y);
diff --git a/engines/kyra/graphics/screen_eob.cpp b/engines/kyra/graphics/screen_eob.cpp
index 4f31074..f1efbd0 100644
--- a/engines/kyra/graphics/screen_eob.cpp
+++ b/engines/kyra/graphics/screen_eob.cpp
@@ -1997,6 +1997,8 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch, int bpp) const {
 		case 0xE1:
 			// TODO: recheck this: no conversion for 'ß' ?
 			break;
+		default:
+			break;
 		}
 	} else if (_width == 8) {
 		switch (c) {
@@ -2022,6 +2024,8 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch, int bpp) const {
 		case 0xE1:
 			c = 0x19;
 			break;
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/kyra/gui/gui_lok.cpp b/engines/kyra/gui/gui_lok.cpp
index 188e992..96a10f0 100644
--- a/engines/kyra/gui/gui_lok.cpp
+++ b/engines/kyra/gui/gui_lok.cpp
@@ -917,6 +917,8 @@ void GUI_LoK::setupControls(Menu &menu) {
 	case 2:
 		menu.item[0].itemString = _onCDString; //"On + CD"
 		break;
+	default:
+		break;
 	}
 
 	if (_vm->_configSounds)
@@ -943,6 +945,7 @@ void GUI_LoK::setupControls(Menu &menu) {
 		break;
 	default:
 		menu.item[2].itemString = "ERROR";
+		break;
 	}
 
 	int textControl = 3;
@@ -971,6 +974,7 @@ void GUI_LoK::setupControls(Menu &menu) {
 			break;
 		default:
 			menu.item[3].itemString = "ERROR";
+			break;
 		}
 	} else {
 		if (_vm->gameFlags().platform == Common::kPlatformAmiga)
@@ -995,6 +999,7 @@ void GUI_LoK::setupControls(Menu &menu) {
 		break;
 	default:
 		menu.item[textControl].itemString = "ERROR";
+		break;
 	}
 
 	initMenuLayout(menu);
diff --git a/engines/kyra/gui/gui_lol.cpp b/engines/kyra/gui/gui_lol.cpp
index 602309c..dd3f8a3 100644
--- a/engines/kyra/gui/gui_lol.cpp
+++ b/engines/kyra/gui/gui_lol.cpp
@@ -2636,6 +2636,8 @@ int GUI_LoL::clickedMainMenu(Button *button) {
 	case 0x4005:
 		_displayMenu = false;
 		break;
+	default:
+		break;
 	}
 	return 1;
 }
diff --git a/engines/kyra/sequence/sequences_darkmoon.cpp b/engines/kyra/sequence/sequences_darkmoon.cpp
index 97dc712..11c7b4e 100644
--- a/engines/kyra/sequence/sequences_darkmoon.cpp
+++ b/engines/kyra/sequence/sequences_darkmoon.cpp
@@ -193,6 +193,9 @@ int DarkMoonEngine::mainMenu() {
 			// quit
 			menuChoice = -5;
 			break;
+
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/kyra/sequence/sequences_eob.cpp b/engines/kyra/sequence/sequences_eob.cpp
index 92facd3..200a5da 100644
--- a/engines/kyra/sequence/sequences_eob.cpp
+++ b/engines/kyra/sequence/sequences_eob.cpp
@@ -1484,6 +1484,9 @@ int EoBEngine::mainMenu() {
 
 			menuChoice = 0;
 			break;
+
+		default:
+			break;
 		}
 	}
 
diff --git a/engines/kyra/sequence/sequences_hof.cpp b/engines/kyra/sequence/sequences_hof.cpp
index 3c28372..a5e44cf 100644
--- a/engines/kyra/sequence/sequences_hof.cpp
+++ b/engines/kyra/sequence/sequences_hof.cpp
@@ -2985,6 +2985,9 @@ int SeqPlayer_HOF::cbHOFDEMO_outhome(WSAMovie_v2 *wsaObj, int x, int y, int frm)
 	case 137:
 		playSoundAndDisplaySubTitle(6);
 		break;
+
+	default:
+		break;
 	}
 
 	return 0;
@@ -3126,6 +3129,9 @@ int SeqPlayer_HOF::cbHOFDEMO_dinob2(WSAMovie_v2 *wsaObj, int x, int y, int frm)
 	case 79:
 		_animCurrentFrame = 4;
 		break;
+
+	default:
+		break;
 	}
 
 	return frm;
diff --git a/engines/kyra/sequence/sequences_lok.cpp b/engines/kyra/sequence/sequences_lok.cpp
index faddf76..ef3cbed 100644
--- a/engines/kyra/sequence/sequences_lok.cpp
+++ b/engines/kyra/sequence/sequences_lok.cpp
@@ -371,6 +371,9 @@ void KyraEngine_LoK::seq_createAmuletJewel(int jewel, int page, int noSound, int
 		case 3:
 			opcodes = specialJewelTable4;
 			break;
+
+		default:
+			break;
 		}
 
 		if (opcodes) {
diff --git a/engines/kyra/text/text_lok.cpp b/engines/kyra/text/text_lok.cpp
index c45f041..f89bd9a 100644
--- a/engines/kyra/text/text_lok.cpp
+++ b/engines/kyra/text/text_lok.cpp
@@ -48,6 +48,8 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const
 		case 3:
 			chatDuration = -1;
 			break;
+		default:
+			break;
 		}
 	}