zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace a bunch of fall-through comments with our fallthrough__ macro.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6976 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-09-04 05:57:41 +00:00
parent 8d72c6e5c5
commit e6277dd8da
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/build/src/sdlayer12.cpp
View file

@ -559,6 +559,7 @@ int32_t handleevents_pollsdl(void)
ev.motion.yrel /= 12; ev.motion.yrel /= 12;
} }
#endif #endif
fallthrough__;
default: // OSD_Printf("Got event (%d)\n", ev.type); break; default: // OSD_Printf("Got event (%d)\n", ev.type); break;
rv = handleevents_sdlcommon(&ev); rv = handleevents_sdlcommon(&ev);
break; break;

6
source/duke3d/src/actors.cpp
View file

@ -4637,7 +4637,7 @@ ACTOR_STATIC void G_MoveActors(void)
int const j = A_Spawn(spriteNum, (PLUTOPAK ? FRAMEEFFECT1 : FRAMEEFFECT1_13)); int const j = A_Spawn(spriteNum, (PLUTOPAK ? FRAMEEFFECT1 : FRAMEEFFECT1_13));
actor[j].t_data[0] = 3; actor[j].t_data[0] = 3;
} }
/* fall-through */ fallthrough__;
case HEAVYHBOMB__STATIC: case HEAVYHBOMB__STATIC:
{ {
int playerNum; int playerNum;
@ -7347,11 +7347,11 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
case LASERLINE__STATIC: continue; case LASERLINE__STATIC: continue;
} }
// fall-through fallthrough__;
case STAT_STANDABLE: case STAT_STANDABLE:
if (sprite[sectSprite].picnum == TRIPBOMB) if (sprite[sectSprite].picnum == TRIPBOMB)
break; break;
// else, fall-through fallthrough__;
case STAT_ACTOR: case STAT_ACTOR:
case STAT_DEFAULT: case STAT_DEFAULT:
if (sprite[sectSprite].picnum == BOLT1 if (sprite[sectSprite].picnum == BOLT1

2
source/duke3d/src/astub.cpp
View file

@ -7683,7 +7683,7 @@ static void Keys2d(void)
{ {
case 0: case 0:
printmessage16("MAP LIMITS EXCEEDED!"); printmessage16("MAP LIMITS EXCEEDED!");
/* fall-through */ fallthrough__;
default: default:
k = 0; k = 0;
break; break;

2
source/duke3d/src/game.cpp
View file

@ -3174,7 +3174,7 @@ int A_Spawn(int spriteNum, int tileNum)
case SE_11_SWINGING_DOOR: // Pivitor rotater case SE_11_SWINGING_DOOR: // Pivitor rotater
T4(newSprite) = (pSprite->ang > 1024) ? 2 : -2; T4(newSprite) = (pSprite->ang > 1024) ? 2 : -2;
/* fall-through */ fallthrough__;
case SE_0_ROTATING_SECTOR: case SE_0_ROTATING_SECTOR:
case SE_2_EARTHQUAKE: // Earthquakemakers case SE_2_EARTHQUAKE: // Earthquakemakers
case SE_5: // Boss Creature case SE_5: // Boss Creature

4
source/duke3d/src/m32def.cpp
View file

@ -2027,7 +2027,7 @@ static int32_t C_ParseCommand(void)
*g_scriptPtr++ = -1; *g_scriptPtr++ = -1;
return 0; return 0;
} }
// fall-through fallthrough__;
case CON_STATE: case CON_STATE:
if (C_GetNextLabelName(1)) if (C_GetNextLabelName(1))
return 1; return 1;
@ -2622,7 +2622,7 @@ repeatcase:
return 1; return 1;
} }
textptr++; textptr++;
// fall-through fallthrough__;
case CON_SETARRAY: case CON_SETARRAY:
if (C_GetNextLabelName(1)) if (C_GetNextLabelName(1))
return 1; return 1;

2
source/duke3d/src/player.cpp
View file

@ -1109,7 +1109,7 @@ static int32_t A_ShootHardcoded(int spriteNum, int projecTile, int shootAng, vec
if (playerNum < 0) if (playerNum < 0)
shootAng += 1024; shootAng += 1024;
Zvel = 1024 - (krand() & 2047); Zvel = 1024 - (krand() & 2047);
// fall-through fallthrough__;
case KNEE__STATIC: case KNEE__STATIC:
if (projecTile == KNEE) if (projecTile == KNEE)
{ {

12
source/duke3d/src/sector.cpp
View file

@ -1389,7 +1389,7 @@ int P_ActivateSwitch(int playerNum, int wallOrSprite, int switchType)
default: default:
if (CheckDoorTile(nSwitchPicnum) == 0) if (CheckDoorTile(nSwitchPicnum) == 0)
break; break;
/* fall-through */ fallthrough__;
case DIPSWITCH_LIKE_CASES: case DIPSWITCH_LIKE_CASES:
if (G_IsLikeDipswitch(nSwitchPicnum)) if (G_IsLikeDipswitch(nSwitchPicnum))
{ {
@ -1401,7 +1401,7 @@ int P_ActivateSwitch(int playerNum, int wallOrSprite, int switchType)
S_PlaySound3D(END_OF_LEVEL_WARN, g_player[playerNum].ps->i, &davector); S_PlaySound3D(END_OF_LEVEL_WARN, g_player[playerNum].ps->i, &davector);
} }
/* fall-through */ fallthrough__;
case ACCESSSWITCH_CASES: case ACCESSSWITCH_CASES:
case MULTISWITCH__STATIC: case MULTISWITCH__STATIC:
case REST_SWITCH_CASES: case REST_SWITCH_CASES:
@ -1563,7 +1563,7 @@ void A_DamageWall_Internal(int spriteNum, int wallNum, const vec3_t *vPos, int w
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
case W_FORCEFIELD__STATIC: case W_FORCEFIELD__STATIC:
pWall->extra = 1; // tell the forces to animate pWall->extra = 1; // tell the forces to animate
/* fall-through */ fallthrough__;
case BIGFORCE__STATIC: case BIGFORCE__STATIC:
{ {
updatesector(vPos->x, vPos->y, &sectNum); updatesector(vPos->x, vPos->y, &sectNum);
@ -2116,7 +2116,7 @@ void A_DamageObject_Internal(int spriteNum, int const dmgSrc)
} }
A_PlaySound(GLASS_HEAVYBREAK,spriteNum); A_PlaySound(GLASS_HEAVYBREAK,spriteNum);
A_PlaySound(SQUISHED,spriteNum); A_PlaySound(SQUISHED,spriteNum);
/* fall-through */ fallthrough__;
case BOTTLE7__STATIC: case BOTTLE7__STATIC:
A_PlaySound(GLASS_BREAKING,spriteNum); A_PlaySound(GLASS_BREAKING,spriteNum);
A_SpawnWallGlass(spriteNum,-1,10); A_SpawnWallGlass(spriteNum,-1,10);
@ -2230,7 +2230,7 @@ void A_DamageObject_Internal(int spriteNum, int const dmgSrc)
case JURYGUY__STATIC: case JURYGUY__STATIC:
A_PlaySound(SLT(spriteNum),spriteNum); A_PlaySound(SLT(spriteNum),spriteNum);
A_Spawn(spriteNum,SHT(spriteNum)); A_Spawn(spriteNum,SHT(spriteNum));
/* fall-through */ fallthrough__;
case SPACEMARINE__STATIC: case SPACEMARINE__STATIC:
sprite[spriteNum].extra -= sprite[dmgSrc].extra; sprite[spriteNum].extra -= sprite[dmgSrc].extra;
if (sprite[spriteNum].extra > 0) break; if (sprite[spriteNum].extra > 0) break;
@ -2288,7 +2288,7 @@ void A_DamageObject_Internal(int spriteNum, int const dmgSrc)
case PLAYERONWATER__STATIC: case PLAYERONWATER__STATIC:
spriteNum = OW(spriteNum); spriteNum = OW(spriteNum);
/* fall-through */ fallthrough__;
default: default:
if ((sprite[spriteNum].cstat&16) && SHT(spriteNum) == 0 && SLT(spriteNum) == 0 && sprite[spriteNum].statnum == STAT_DEFAULT) if ((sprite[spriteNum].cstat&16) && SHT(spriteNum) == 0 && SLT(spriteNum) == 0 && sprite[spriteNum].statnum == STAT_DEFAULT)
break; break;