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

digitall 547637+digitall at users.noreply.github.com
Sun Oct 20 02:58:22 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:
ba6834c96e SKY: Fix Missing Default Switch Cases


Commit: ba6834c96e33723ad16f7d7fbaaba17a5e35e91d
    https://github.com/scummvm/scummvm/commit/ba6834c96e33723ad16f7d7fbaaba17a5e35e91d
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-20T01:53:57+01:00

Commit Message:
SKY: Fix Missing Default Switch Cases

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

Changed paths:
    engines/sky/debug.cpp
    engines/sky/logic.cpp


diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp
index 78ded55..2d00c0b 100644
--- a/engines/sky/debug.cpp
+++ b/engines/sky/debug.cpp
@@ -1258,6 +1258,8 @@ bool Debugger::Cmd_LogicCommand(int argc, const char **argv) {
 		case  3:
 			arg1 = atoi(argv[2]);
 			// fall through
+		default:
+			break;
 	}
 
 	for (int i = 0; i < numMCodes; ++i) {
diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index 8833b45..aa2d4f6 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -1318,6 +1318,8 @@ uint16 Logic::script(uint16 scriptNo, uint16 offset) {
 					case 1:
 						a = pop();
 						// fall through
+					default:
+						break;
 					}
 
 					uint16 mcode = *scriptData++ / 4; // get mcode number





More information about the Scummvm-git-logs mailing list