diff options
| author | Adrian Frühwirth | 2018-03-24 15:40:00 +0100 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-03-24 15:53:25 +0100 |
| commit | a222fc8ad8f31afb4a306b6ce391aa0d47ea86cf (patch) | |
| tree | a65f8c761af97470f57fd774fc8273caf9a459b8 /engines/dm | |
| parent | cb076448770a3e4a41405b5eac1d1dd1714cb5c8 (diff) | |
| download | scummvm-rg350-a222fc8ad8f31afb4a306b6ce391aa0d47ea86cf.tar.gz scummvm-rg350-a222fc8ad8f31afb4a306b6ce391aa0d47ea86cf.tar.bz2 scummvm-rg350-a222fc8ad8f31afb4a306b6ce391aa0d47ea86cf.zip | |
JANITORIAL: Silence GCC 7 fallthrough warnings
Verified intentional.
Diffstat (limited to 'engines/dm')
| -rw-r--r-- | engines/dm/dungeonman.cpp | 1 | ||||
| -rw-r--r-- | engines/dm/gfx.cpp | 1 | ||||
| -rw-r--r-- | engines/dm/group.cpp | 1 | ||||
| -rw-r--r-- | engines/dm/menus.cpp | 1 | ||||
| -rw-r--r-- | engines/dm/projexpl.cpp | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp index ab35477183..7d7b80685e 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 7f31b29575..ba28e25fde 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 dfdcdc017f..f36a8ddc31 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 1600f589e9..7626cb0425 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 e8b0f4a143..0738cf64ba 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)) { |