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

digitall 547637+digitall at users.noreply.github.com
Thu Oct 17 01:51: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:
f7593adb3e CINE: Fix Missing Default Switch Cases


Commit: f7593adb3e778b733d300ff97216b2ff61439bbd
    https://github.com/scummvm/scummvm/commit/f7593adb3e778b733d300ff97216b2ff61439bbd
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-17T00:47:34+01:00

Commit Message:
CINE: Fix Missing Default Switch Cases

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

Changed paths:
    engines/cine/gfx.cpp
    engines/cine/object.cpp
    engines/cine/script_fw.cpp
    engines/cine/various.cpp


diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index b9175ca..981d73e 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -635,6 +635,9 @@ void FWRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 
 		fillSprite(*obj);
 		break;
+
+	default:
+		break;
 	}
 }
 
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index f014843..5eabc79 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -244,6 +244,8 @@ void modifyObjectParam(byte objIdx, byte paramIdx, int16 newValue) {
 	case 6:
 		g_cine->_objectTable[objIdx].part = newValue;
 		break;
+	default:
+		break;
 	}
 }
 
@@ -310,6 +312,8 @@ int16 getObjectParam(uint16 objIdx, uint16 paramIdx) {
 		return g_cine->_objectTable[objIdx].costume;
 	case 5:
 		return g_cine->_objectTable[objIdx].part;
+	default:
+		break;
 	}
 
 	return 0;
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 86eb709..4383c11 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -459,6 +459,8 @@ int RawScript::getNextLabel(const FWScriptInfo &info, int offset) const {
 				break;
 			case 'x': // exit script
 				return -pos - 1;
+			default:
+				break;
 			}
 		}
 	}
@@ -1439,6 +1441,8 @@ int FWScript::o1_loadNewPrcName() {
 		debugC(5, kCineDebugScript, "Line: %d: loadMsg(\"%s\")", _line, param2);
 		Common::strlcpy(newMsgName, param2, sizeof(newMsgName));
 		break;
+	default:
+		break;
 	}
 	return 0;
 }
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index d6654f1..b571000 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -523,6 +523,8 @@ void CineEngine::makeSystemMenu() {
 			}
 			break;
 		}
+		default:
+			break;
 		}
 
 		inMenu = false;





More information about the Scummvm-git-logs mailing list