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

[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:
fbb60c6d89 TOUCHE: Fix Missing Default Switch Cases


Commit: fbb60c6d8997bcaf671a52ca114bbb3d6293b43b
    https://github.com/scummvm/scummvm/commit/fbb60c6d8997bcaf671a52ca114bbb3d6293b43b
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-09T05:42:33Z

Commit Message:
TOUCHE: Fix Missing Default Switch Cases

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

Changed paths:
    engines/touche/menu.cpp
    engines/touche/opcodes.cpp
    engines/touche/touche.cpp


diff --git a/engines/touche/menu.cpp b/engines/touche/menu.cpp
index 72f37b9..b3698f1 100644
--- a/engines/touche/menu.cpp
+++ b/engines/touche/menu.cpp
@@ -76,6 +76,8 @@ void ToucheEngine::drawButton(Button *button) {
 			dx = -1;
 			dy = -2;
 			break;
+		default:
+			break;
 		}
 		const int x = button->x + button->w / 2;
 		const int y = button->y + button->h / 2;
@@ -158,6 +160,8 @@ static void setupMenu(MenuMode mode, MenuData *menuData) {
 		menuData->buttonsTable = saveLoadButtonsTable;
 		menuData->buttonsCount = ARRAYSIZE(saveLoadButtonsTable);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -177,6 +181,8 @@ void ToucheEngine::redrawMenu(MenuData *menu) {
 	case kMenuSaveStateMode:
 		drawSaveGameStateDescriptions(_offscreenBuffer, kScreenWidth, menu, _saveLoadCurrentPage, _saveLoadCurrentSlot);
 		break;
+	default:
+		break;
 	}
 	for (uint i = 0; i < menu->buttonsCount; ++i) {
 		drawButton(&menu->buttonsTable[i]);
diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp
index 2af9428..5c29d82 100644
--- a/engines/touche/opcodes.cpp
+++ b/engines/touche/opcodes.cpp
@@ -422,6 +422,8 @@ void ToucheEngine::op_setFlag() {
 	case 619:
 		debug(0, "Unknown music flag %d", val);
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index e8a867a..4bc8822 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -338,6 +338,8 @@ void ToucheEngine::writeConfigurationSettings() {
 		ConfMan.setBool("speech_mute", false);
 		ConfMan.setBool("subtitles", true);
 		break;
+	default:
+		break;
 	}
 	ConfMan.setInt("music_volume", getMusicVolume());
 	ConfMan.flushToDisk();
@@ -851,6 +853,8 @@ void ToucheEngine::setKeyCharFrame(int keyChar, int16 type, int16 value1, int16
 		key->anim3Start = value1;
 		key->anim3Count = value2;
 		break;
+	default:
+		break;
 	}
 }
 
@@ -1612,6 +1616,8 @@ void ToucheEngine::handleLeftMouseButtonClickOnInventory() {
 						drawInventory(_objectDescriptionNum, 1);
 					}
 					break;
+				default:
+					break;
 				}
 			}
 			break;
@@ -1699,6 +1705,8 @@ void ToucheEngine::handleMouseClickOnRoom(int flag) {
 					}
 				}
 				break;
+			default:
+				break;
 			}
 			if (_giveItemToCounter == 0 && !_hideInventoryTexts) {
 				if (hitBox->contains(hitPosX, hitPosY)) {
@@ -2098,6 +2106,8 @@ void ToucheEngine::updateRoomRegions() {
 				}
 				i += _programAreaTable[i].animCount + 1;
 				break;
+			default:
+				break;
 			}
 		}
 	}
@@ -2778,6 +2788,8 @@ void ToucheEngine::adjustKeyCharPosToWalkBox(KeyChar *key, int moveType) {
 			key->yPos = dy * kz / dz + y1;
 		}
 		break;
+	default:
+		break;
 	}
 }
 
@@ -3057,6 +3069,8 @@ void ToucheEngine::updateKeyCharWalkPath(KeyChar *key, int16 dx, int16 dy, int16
 			}
 		}
 		break;
+	default:
+		break;
 	}
 }