[Scummvm-git-logs] scummvm master -> 28a7ebc48db3394d5bd2c0f9a6fa93c5a6d60fca

[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:
28a7ebc48d SWORD1: Fix Missing Default Switch Cases


Commit: 28a7ebc48db3394d5bd2c0f9a6fa93c5a6d60fca
    https://github.com/scummvm/scummvm/commit/28a7ebc48db3394d5bd2c0f9a6fa93c5a6d60fca
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-20T15:39:58+01:00

Commit Message:
SWORD1: Fix Missing Default Switch Cases

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

Changed paths:
    engines/sword1/animation.cpp
    engines/sword1/control.cpp
    engines/sword1/logic.cpp
    engines/sword1/objectman.cpp


diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index e58eb97..bb74c7b 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -187,6 +187,8 @@ bool MoviePlayer::load(uint32 id) {
 	case kVideoDecoderMP2:
 		filename = Common::String::format("%s.mp2", sequenceList[id]);
 		break;
+	default:
+		break;
 	}
 
 	// Need to switch to true color for PSX/MP2 videos
@@ -268,6 +270,8 @@ void MoviePlayer::performPostProcessing(byte *screen) {
 				case LETTER_COL:
 					dst[x] = findTextColor();
 					break;
+				default:
+					break;
 				}
 			}
 			src += _textWidth;
@@ -443,6 +447,8 @@ uint32 MoviePlayer::findTextColor() {
 			return g_system->getScreenFormat().RGBToColor(200, 120, 184);
 		case 4:
 			return g_system->getScreenFormat().RGBToColor(80, 152, 184);
+		default:
+			break;
 		}
 
 		return g_system->getScreenFormat().RGBToColor(0xFF, 0xFF, 0xFF);
@@ -457,6 +463,8 @@ uint32 MoviePlayer::findTextColor() {
 		return _c3Color;
 	case 4:
 		return _c4Color;
+	default:
+		break;
 	}
 	return _c1Color;
 }
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index d385b2e..cd51f84 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -548,6 +548,8 @@ uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) {
 		break;
 	case BUTTON_VOLUME_PANEL:
 		return id;
+	default:
+		break;
 	}
 	return 0;
 }
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 1b70e8c..a4c6cf6 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -148,6 +148,8 @@ void Logic::engine() {
 						case LOGIC_AR_animate:
 							_eventMan->checkForEvent(compact);
 							break;
+						default:
+							break;
 						}
 					}
 					debug(7, "Logic::engine: handling compact %d (%X)", currentId, currentId);
diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index 651e47f..c976b70 100644
--- a/engines/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
@@ -153,6 +153,8 @@ char *ObjectMan::lockText(uint32 textId, uint8 lang) {
 			return const_cast<char *>(_translationId6488082[lang]);
 		case 6488083:
 			return const_cast<char *>(_translationId6488083[lang]);
+		default:
+			break;
 		}
 
 		warning("ObjectMan::lockText(%d): only %d texts in file", textId & ITM_ID, _resMan->readUint32(addr));