Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
JANITORIAL: Silence GCC 7 fallthrough warnings
Verified intentional.
  • Loading branch information
bonki committed Mar 24, 2018
1 parent cb07644 commit a222fc8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions engines/dm/dungeonman.cpp
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions engines/dm/gfx.cpp
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions engines/dm/group.cpp
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions engines/dm/menus.cpp
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion engines/dm/projexpl.cpp
Expand Up @@ -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)) {
Expand Down

0 comments on commit a222fc8

Please sign in to comment.