libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JANITORIAL: Silence more GCC 7 warnings

Browse Source 
There were all flagged as intentional fall throughs. I simply changed
the comments to something GCC would recognize.
This commit is contained in:
Torbjörn Andersson 2017-08-06 12:26:05 +02:00
parent 4fb0d1e56f
commit 462f1c9859
16 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/avalanche/avalot.cpp
View File

@ -161,10 +161,11 @@ void AvalancheEngine::handleKeyDown(Common::Event &event) {
case Common::KEYCODE_END:
case Common::KEYCODE_KP5:
if (_alive && _avvyIsAwake) {
_animation->handleMoveKey(event); // Fallthroughs are intended.
_animation->handleMoveKey(event);
drawDirection();
return;
}
// fall through
case Common::KEYCODE_BACKSPACE:
_parser->handleBackspace();
break;

2
engines/bladerunner/script/ai/officer_leary.cpp
View File

@ -434,7 +434,7 @@ bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber)
AI_Movement_Track_Append(kActorOfficerLeary, 420, 10);
AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
AI_Movement_Track_Repeat(kActorOfficerLeary);
//no break
// fall through
case 10:
AI_Movement_Track_Append(kActorOfficerLeary, 310, 0);
AI_Movement_Track_Append(kActorOfficerLeary, 307, 0);

2
engines/cge/bitmap.cpp
View File

@ -293,7 +293,7 @@ bool Bitmap::solidAt(int16 x, int16 y) {
switch (t) {
case kBmpEOI:
r--;
// No break on purpose
// fall through
case kBmpSKP:
w = 0;
break;

2
engines/cge/events.cpp
View File

@ -111,7 +111,7 @@ bool Keyboard::getKey(Common::Event &event) {
_vm->_commandHandler->addCommand(kCmdLevel, -1, keycode - Common::KEYCODE_0, NULL);
return false;
}
// Fallthrough intended
// fall through
case Common::KEYCODE_5:
case Common::KEYCODE_6:
case Common::KEYCODE_7:

2
engines/cge2/bitmap.cpp
View File

@ -301,7 +301,7 @@ bool Bitmap::solidAt(V2D pos) {
switch (t) {
case kBmpEOI:
r--;
// No break on purpose
// fall through
case kBmpSKP:
w = 0;
break;

2
engines/cine/main_loop.cpp
View File

@ -171,7 +171,7 @@ static void processEvent(Common::Event &event) {
g_cine->getDebugger()->attach();
g_cine->getDebugger()->onFrame();
}
// No Break to allow fallthrough to process 'd' without CTRL
// fall through
default:
lastKeyStroke = event.kbd.keycode;
break;

6
engines/cruise/script.cpp
View File

@ -57,7 +57,7 @@ int32 opcodeType0() {
case 5:
index = saveOpcodeVar;
// No break on purpose
// fall through
case 1: {
uint8 *address = 0;
int type = getByteFromScript();
@ -137,7 +137,7 @@ int32 opcodeType1() {
case 5:
offset = saveOpcodeVar;
//no break on purpose
// fall through
case 1: {
int var_A = 0;
@ -227,7 +227,7 @@ int32 opcodeType2() {
switch (currentScriptOpcodeType) {
case 5:
index = saveOpcodeVar;
// No break on purpose
// fall through
case 1: {
uint8* adresse = NULL;
int type = getByteFromScript();

2
engines/dm/champion.cpp
View File

@ -729,7 +729,7 @@ Thing ChampionMan::getObjectRemovedFromSlot(uint16 champIndex, uint16 slotIndex)
switch (curIconIndex) {
case kDMIconIndiceContainerChestClosed:
inventory.closeChest();
// No break on purpose
// fall through
case kDMIconIndiceScrollOpen:
case kDMIconIndiceScrollClosed:
setFlag(curChampion->_attributes, kDMAttributePanel);

2
engines/dm/dungeonman.cpp
View File

@ -935,7 +935,7 @@ T0172010_ClosedFakeWall:
}
aspectArray[kDMSquareAspectElement] = kDMElementTypeCorridor;
AL0307_uc_FootprintsAllowed = getFlag(AL0307_uc_Square, kDMSquareMaskFakeWallRandOrnamentOrFootprintsAllowed) ? 8 : 0;
// No break on purpose
// fall through
case kDMElementTypeCorridor:
case kDMElementTypePit:
case kDMElementTypeTeleporter:

26
engines/dm/gfx.cpp
View File

@ -1463,7 +1463,7 @@ void DisplayMan::drawSquareD3L(Direction dir, int16 posX, int16 posY) {
case kDMElementTypePit:
if (!squareAspect[kDMSquareAspectPitInvisible])
drawFloorPitOrStairsBitmap(kDMGraphicIdxFloorPitD3L, frameFloorPitD3L);
// no break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight;
@ -1546,7 +1546,7 @@ void DisplayMan::drawSquareD3R(Direction dir, int16 posX, int16 posY) {
case kDMElementTypePit:
if (!squareAspect[kDMSquareAspectPitInvisible])
drawFloorPitOrStairsBitmapFlippedHorizontally(kDMGraphicIdxFloorPitD3L, frameFloorPitD3R);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackRightBackLeftFrontRightFrontLeft;
@ -1626,7 +1626,7 @@ void DisplayMan::drawSquareD3C(Direction dir, int16 posX, int16 posY) {
case kDMElementTypePit:
if (!squareAspect[kDMSquareAspectPitInvisible])
drawFloorPitOrStairsBitmap(kDMGraphicIdxFloorPitD3C, frameFloorPitD3C);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight;
@ -1690,7 +1690,7 @@ void DisplayMan::drawSquareD2L(Direction dir, int16 posX, int16 posY) {
break;
case kDMElementTypeStairsSide:
drawFloorPitOrStairsBitmap(_stairsNativeBitmapIndexSideD2L, frameStairsSideD2L);
// No break on purpose
// fall through
case kDMElementTypeDoorSide:
order = kDMCellOrderBackRightFrontLeftFrontRight;
drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD2L); /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */
@ -1706,7 +1706,7 @@ void DisplayMan::drawSquareD2L(Direction dir, int16 posX, int16 posY) {
case kDMElementTypePit:
drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD2L : kDMGraphicIdxFloorPitD2L,
frameFloorPitD2L);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight;
@ -1775,7 +1775,7 @@ void DisplayMan::drawSquareD2R(Direction dir, int16 posX, int16 posY) {
break;
case kDMElementTypeStairsSide:
drawFloorPitOrStairsBitmapFlippedHorizontally(_stairsNativeBitmapIndexSideD2L, frameStairsSideD2R);
// No break on purpose
// fall through
case kDMElementTypeDoorSide:
order = kDMCellOrderBackLeftFrontRightFrontLeft;
/* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */
@ -1793,7 +1793,7 @@ void DisplayMan::drawSquareD2R(Direction dir, int16 posX, int16 posY) {
case kDMElementTypePit:
drawFloorPitOrStairsBitmapFlippedHorizontally(
squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD2L : kDMGraphicIdxFloorPitD2L, frameFloorPitD2R);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackRightBackLeftFrontRightFrontLeft;
@ -1876,7 +1876,7 @@ void DisplayMan::drawSquareD2C(Direction dir, int16 posX, int16 posY) {
break;
case kDMElementTypePit:
drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD2C : kDMGraphicIdxFloorPitD2C, frameFloorPitD2C);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight;
@ -1944,7 +1944,7 @@ void DisplayMan::drawSquareD1L(Direction dir, int16 posX, int16 posY) {
drawFloorPitOrStairsBitmap(_stairsNativeBitmapIndexUpSideD1L, frameStairsUpSideD1L);
else
drawFloorPitOrStairsBitmap(_stairsNativeBitmapIndexDownSideD1L, frameStairsDownSideD1L);
// No break on purpose
// fall through
case kDMElementTypeDoorSide:
order = kDMCellOrderBackRightFrontRight;
/* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */
@ -1961,7 +1961,7 @@ void DisplayMan::drawSquareD1L(Direction dir, int16 posX, int16 posY) {
break;
case kDMElementTypePit:
drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD1L : kDMGraphicIdxFloorPitD1L, frameFloorPitD1L);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackRightFrontRight;
@ -2029,7 +2029,7 @@ void DisplayMan::drawSquareD1R(Direction dir, int16 posX, int16 posY) {
else
drawFloorPitOrStairsBitmapFlippedHorizontally(_stairsNativeBitmapIndexDownSideD1L, frameStairsDownSideD1R);
// No break on purpose
// fall through
case kDMElementTypeDoorSide:
order = kDMCellOrderBackLeftFrontLeft;
drawFloorOrnament(squareAspect[kDMSquareAspectFloorOrn], kDMViewFloorD1R); /* BUG0_64 Floor ornaments are drawn over open pits. There is no check to prevent drawing floor ornaments over open pits */
@ -2046,7 +2046,7 @@ void DisplayMan::drawSquareD1R(Direction dir, int16 posX, int16 posY) {
case kDMElementTypePit:
drawFloorPitOrStairsBitmapFlippedHorizontally(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD1L
: kDMGraphicIdxFloorPitD1L, frameFloorPitD1R);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackLeftFrontLeft;
@ -2134,7 +2134,7 @@ void DisplayMan::drawSquareD1C(Direction dir, int16 posX, int16 posY) {
break;
case kDMElementTypePit:
drawFloorPitOrStairsBitmap(squareAspect[kDMSquareAspectPitInvisible] ? kDMGraphicIdxFloorPitInvisibleD1C : kDMGraphicIdxFloorPitD1C, frameFloorPitD1C);
// No break on purpose
// fall through
case kDMElementTypeTeleporter:
case kDMElementTypeCorridor:
order = kDMCellOrderBackLeftBackRightFrontLeftFrontRight;

1
engines/dm/group.cpp
View File

@ -727,6 +727,7 @@ T0209005_AddEventAndReturn:
if (AL0446_i_Behavior2Or3 || (_vm->getRandomNumber(4))) /* BUG0_00 Useless code. Behavior cannot be 2 nor 3 because these values are never used. The actual condition is thus: if 3/4 chances then no reaction */
return;
} /* No 'break': proceed to instruction after the next 'case' below. Reaction is to move in a random direction to try and avoid other projectiles */
// fall through
case kDMEventTypeCreateReactionDangerOnSquare: /* This event is used when some creatures in the group were killed by a Poison Cloud or by a closing door or if Lord Chaos is surrounded by 3 Fluxcages. It causes the creature to move in a random direction to avoid the danger */
approachAfterReaction = (AL0447_i_Behavior == kDMBehaviorAttack); /* If the creature behavior is 'Attack' and it has to move to avoid danger then it will change its behavior to 'Approach' after the movement */
newGroupDirectionFound = false;

2
engines/dm/menus.cpp
View File

@ -1154,7 +1154,7 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) {
break;
case kDMActionConfuse:
decrementCharges(curChampion);
// No break on purpose
// fall through
case kDMActionWarCry:
case kDMActionCalm:
case kDMActionBrandish:

2
engines/dm/movesens.cpp
View File

@ -105,7 +105,7 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
case kDMSensorWallOrnClickWithSpecObjRemovedRotateSensors:
if (sensorCountToProcessPerCell[cellIdx]) /* If the sensor is not the last one of its type on the cell */
continue;
// No break on purpose
// fall through
case kDMSensorWallOrnClickWithSpecObj:
case kDMSensorWallOrnClickWithSpecObjRemoved:
doNotTriggerSensor = ((sensorData == _vm->_objectMan->getObjectType(leaderHandObject)) == currentSensor->getAttrRevertEffectA());

2
engines/dm/sounds.cpp
View File

@ -43,7 +43,7 @@ SoundMan *SoundMan::getSoundMan(DMEngine *vm, const DMADGameDescription *gameVer
switch (gameVersion->_desc.platform) {
default:
warning("Unknown platform, using default Amiga SoundMan");
// No break on purpose
// fall through
case Common::kPlatformAmiga:
return new SoundMan(vm);
case Common::kPlatformAtariST:

2
engines/draci/walking.cpp
View File

@ -751,7 +751,7 @@ Movement WalkingState::animationForSightDirection(SightDirection dir, const Comm
} else if (mouse.x > hero.x) {
return kStopRight;
}
// fall-through here intentional
// fall through
default: {
// Find the last horizontal direction on the path.
int i = path.size() - 1;

2
engines/gob/hotspots.cpp
View File

@ -1422,7 +1422,7 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs,
case 20:
inputId = i;
// Fall through to case 2
// fall through
case kTypeClick:
key = _vm->_game->_script->readInt16();
ids[i] = _vm->_game->_script->readInt16();