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

DrMcCoy drmccoy at drmccoy.de
Tue Feb 13 13:37:55 CET 2018


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:
a5fcdb55da GOB: Mark intentional fallthrough in switch statements


Commit: a5fcdb55da40592718811caee82160ca97681ff9
    https://github.com/scummvm/scummvm/commit/a5fcdb55da40592718811caee82160ca97681ff9
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2018-02-13T13:29:03+01:00

Commit Message:
GOB: Mark intentional fallthrough in switch statements

Changed paths:
    engines/gob/draw_v2.cpp
    engines/gob/expression.cpp
    engines/gob/minigames/geisha/oko.cpp


diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp
index 9855b1e..8d487f8 100644
--- a/engines/gob/draw_v2.cpp
+++ b/engines/gob/draw_v2.cpp
@@ -562,6 +562,7 @@ void Draw_v2::printTotText(int16 id) {
 
 		default:
 			str[strPos] = (char) cmd;
+			// fall through
 		case 32:
 			mask[strPos++] = maskChar;
 			ptr++;
diff --git a/engines/gob/expression.cpp b/engines/gob/expression.cpp
index 1a99412..c108e1d 100644
--- a/engines/gob/expression.cpp
+++ b/engines/gob/expression.cpp
@@ -153,7 +153,7 @@ void Expression::skipExpr(char stopToken) {
 
 			case 15:
 				_vm->_game->_script->skip(2);
-
+				// fall through
 			case OP_ARRAY_INT8:
 			case OP_ARRAY_INT32:
 			case OP_ARRAY_INT16:
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index a9e13f5..9ede398 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -79,6 +79,7 @@ void Oko::advance() {
 		case kStateBreathe:
 			if ((getFrame() == 6) || (getFrame() == 23))
 				_sound->blasterPlay(_breathe, 1, 0);
+			// fall through
 		case kStateSink:
 		case kStateRaise:
 		case kStateHurt:





More information about the Scummvm-git-logs mailing list