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

[bonki]

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:
a222fc8ad8 JANITORIAL: Silence GCC 7 fallthrough warnings


Commit: a222fc8ad8f31afb4a306b6ce391aa0d47ea86cf
    https://github.com/scummvm/scummvm/commit/a222fc8ad8f31afb4a306b6ce391aa0d47ea86cf
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-24T15:53:25+01:00

Commit Message:
JANITORIAL: Silence GCC 7 fallthrough warnings

Verified intentional.

Changed paths:
    engines/dm/dungeonman.cpp
    engines/dm/gfx.cpp
    engines/dm/group.cpp
    engines/dm/menus.cpp
    engines/dm/projexpl.cpp


diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
index ab35477..7d7b806 100644
--- a/engines/dm/dungeonman.cpp
+++ b/engines/dm/dungeonman.cpp
@@ -1465,6 +1465,7 @@ Thing DungeonMan::getDiscardThing(uint16 thingType) {
 							case kDMThingTypeGroup:
 								if (((Group *)squareThingData)->getDoNotDiscard())
 									continue;
+								// fall through
 							case kDMThingTypeProjectile:
 								setCurrentMap(mapIndex);
 								if (thingType == kDMThingTypeGroup) {
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index 7f31b29..ba28e25 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -2200,6 +2200,7 @@ void DisplayMan::drawSquareD0R(Direction dir, int16 posX, int16 posY) {
 	case kDMElementTypePit:
 		drawFloorPitOrStairsBitmapFlippedHorizontally(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD0L
 														   : kDMGraphicIdxFloorPitD0L, frameFloorPitD0R);
+		// fall through
 	case kDMElementTypeCorridor:
 	case kDMElementTypeDoorSide:
 	case kDMElementTypeTeleporter:
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp
index dfdcdc0..f36a8dd 100644
--- a/engines/dm/group.cpp
+++ b/engines/dm/group.cpp
@@ -1518,6 +1518,7 @@ bool GroupMan::isCreatureAttacking(Group *group, int16 mapX, int16 mapY, uint16
 				projectileThing = _vm->_thingExplPoisonCloud;
 				break;
 			}
+			// fall through
 		case kDMCreatureTypeDemon:
 		case kDMCreatureTypeRedDragon:
 			projectileThing = _vm->_thingExplFireBall;
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index 1600f58..7626cb0 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -1136,6 +1136,7 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) {
 			_vm->_sound->requestPlay(kDMSoundIndexWoodenThudAttackTrolinAntmanStoneGolem, dungeon._partyMapX, dungeon._partyMapY, kDMSoundModePlayOneTickLater);
 			break;
 		}
+		// fall through
 	case kDMActionDisrupt:
 	case kDMActionJab:
 	case kDMActionParry:
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp
index e8b0f4a..0738cf6 100644
--- a/engines/dm/projexpl.cpp
+++ b/engines/dm/projexpl.cpp
@@ -503,10 +503,10 @@ void ProjExpl::processEvent25(TimelineEvent *event) {
 	case 0xFF82:
 		if (!(attack >>= 1))
 			break;
+		// fall through
 	case 0xFF80:
 		if (curSquareType == kDMElementTypeDoor)
 			_vm->_groupMan->groupIsDoorDestoryedByAttack(mapX, mapY, attack, true, 0);
-
 		break;
 	case 0xFF83:
 		if ((groupThing != _vm->_thingEndOfList) && getFlag(creatureInfo->_attributes, kDMCreatureMaskNonMaterial)) {