[Scummvm-git-logs] scummvm master -> 3bd273fc8e545165d1eca737d804375283587afd

digitall 547637+digitall at users.noreply.github.com
Sun Oct 13 19:21:41 CEST 2019


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:
3bd273fc8e ADL: Fix Missing Default Switch Cases


Commit: 3bd273fc8e545165d1eca737d804375283587afd
    https://github.com/scummvm/scummvm/commit/3bd273fc8e545165d1eca737d804375283587afd
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-13T18:17:46+01:00

Commit Message:
ADL: Fix Missing Default Switch Cases

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

Changed paths:
    engines/adl/adl.cpp
    engines/adl/console.cpp
    engines/adl/hires5.cpp


diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 9bd0011..7ae33fb 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -245,6 +245,8 @@ Common::String AdlEngine::inputString(byte prompt) const {
 					s.deleteLastChar();
 				}
 				break;
+			default:
+				break;
 			};
 		} else {
 			if (s.size() < 255) {
diff --git a/engines/adl/console.cpp b/engines/adl/console.cpp
index 4567265..def444f 100644
--- a/engines/adl/console.cpp
+++ b/engines/adl/console.cpp
@@ -372,6 +372,9 @@ void Console::printItem(const Item &item) {
 	case IDI_ITEM_DOESNT_MOVE:
 		state = "FIXED";
 		break;
+	default:
+		state = "UNKNOWN";
+		break;
 	}
 
 	debugPrintf("%3d %s %-30s %-10s %-8s (%3d, %3d)\n", item.id, name.c_str(), desc.c_str(), _engine->itemRoomStr(item.room).c_str(), state.c_str(), item.position.x, item.position.y);
diff --git a/engines/adl/hires5.cpp b/engines/adl/hires5.cpp
index b9b51c6..24a31b0 100644
--- a/engines/adl/hires5.cpp
+++ b/engines/adl/hires5.cpp
@@ -371,6 +371,9 @@ void HiRes5Engine::applyRegionWorkarounds() {
 		// to dig with. Probably a remnant of an earlier version
 		// of the script.
 		removeCommand(_roomCommands, 0);
+		break;
+	default:
+		break;
 	}
 }
 





More information about the Scummvm-git-logs mailing list