[Scummvm-git-logs] scummvm master -> 14525bb412ece2869d1b2fc2b769ae207fa5f559

eriktorbjorn eriktorbjorn at telia.com
Sun Aug 6 11:48:21 CEST 2017


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:
14525bb412 JANITORIAL: Silence some GCC 7 warnings


Commit: 14525bb412ece2869d1b2fc2b769ae207fa5f559
    https://github.com/scummvm/scummvm/commit/14525bb412ece2869d1b2fc2b769ae207fa5f559
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-08-06T11:48:14+02:00

Commit Message:
JANITORIAL: Silence some GCC 7 warnings

We have lots and lots of -Wimplicit-fallthrough warnings, and I
don't know if it's worth fixing them or not. But if we want to,
this is how it can be done.

Changed paths:
    engines/agi/global.cpp
    engines/agi/graphics.cpp
    engines/sci/engine/kstring.cpp


diff --git a/engines/agi/global.cpp b/engines/agi/global.cpp
index bd7e4e4..c44f9e6 100644
--- a/engines/agi/global.cpp
+++ b/engines/agi/global.cpp
@@ -69,7 +69,7 @@ byte AgiEngine::getVar(int16 varNr) {
 	switch (varNr) {
 	case VM_VAR_SECONDS:
 		getVarSecondsHeuristicTrigger();
-		// is supposed to fall through
+		// fall through
 	case VM_VAR_MINUTES:
 	case VM_VAR_HOURS:
 	case VM_VAR_DAYS:
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index 3b1b99f..fa1f11c 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -1003,7 +1003,7 @@ void GfxMgr::drawBox(int16 x, int16 y, int16 width, int16 height, byte backgroun
 	case Common::kRenderHercA:
 	case Common::kRenderHercG:
 		lineColor = 0; // change linecolor to black
-		// supposed to fall through
+		// fall through
 	case Common::kRenderCGA:
 	case Common::kRenderEGA:
 	case Common::kRenderVGA:
@@ -1027,7 +1027,7 @@ void GfxMgr::drawDisplayRect(int16 x, int16 y, int16 width, int16 height, byte c
 	case Common::kRenderHercA:
 		if (color)
 			color = 1; // change any color except black to green/amber
-		// supposed to fall through
+		// fall through
 	case Common::kRenderEGA:
 	default:
 		drawDisplayRectEGA(x, y, width, height, color);
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 4c5f122..3c6a042 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -374,6 +374,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
 			case 'x':
 			case 'u':
 				unsignedVar = true;
+				/* fall through */
 			case 'd': { /* Copy decimal */
 				/* int templen; -- unused atm */
 				const char *format_string = "%d";





More information about the Scummvm-git-logs mailing list