zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix gcc 7.1.0 warnings

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6370 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-07-18 20:53:41 +00:00
parent 60098c45d6
commit dad337add8
25 changed files with 141 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/audiolib/src/multivoc.cpp
View file

@ -619,11 +619,15 @@ void MV_SetVoiceMixMode(VoiceNode *voice)
switch (type) switch (type)
{ {
case T_16BITSOURCE | T_LEFTQUIET: MV_LeftVolume = MV_RightVolume; case T_16BITSOURCE | T_LEFTQUIET:
MV_LeftVolume = MV_RightVolume;
fallthrough__;
case T_16BITSOURCE | T_MONO: case T_16BITSOURCE | T_MONO:
case T_16BITSOURCE | T_RIGHTQUIET: voice->mix = MV_Mix16BitMono16; break; case T_16BITSOURCE | T_RIGHTQUIET: voice->mix = MV_Mix16BitMono16; break;
case T_LEFTQUIET: MV_LeftVolume = MV_RightVolume; case T_LEFTQUIET:
MV_LeftVolume = MV_RightVolume;
fallthrough__;
case T_MONO: case T_MONO:
case T_RIGHTQUIET: voice->mix = MV_Mix16BitMono; break; case T_RIGHTQUIET: voice->mix = MV_Mix16BitMono; break;

8
source/build/include/compat.h
View file

@ -227,13 +227,13 @@
#endif #endif
#if __has_cpp_attribute(fallthrough) #if __has_cpp_attribute(fallthrough)
# define FALLTHROUGH [[fallthrough]] # define fallthrough__ [[fallthrough]]
#elif __has_cpp_attribute(clang::fallthrough) #elif __has_cpp_attribute(clang::fallthrough)
# define FALLTHROUGH [[clang::fallthrough]] # define fallthrough__ [[clang::fallthrough]]
#elif __has_cpp_attribute(gnu::fallthrough) #elif __has_cpp_attribute(gnu::fallthrough)
# define FALLTHROUGH [[gnu::fallthrough]] # define fallthrough__ [[gnu::fallthrough]]
#else #else
# define FALLTHROUGH # define fallthrough__
#endif #endif

2
source/build/src/build.cpp
View file

@ -304,11 +304,13 @@ static int32_t osdcmd_vidmode(osdfuncparm_t const * const parm)
break; break;
case 4: // fs, res, bpp switch case 4: // fs, res, bpp switch
newfullscreen = (Batol(parm->parms[3]) != 0); newfullscreen = (Batol(parm->parms[3]) != 0);
fallthrough__;
case 3: // res & bpp switch case 3: // res & bpp switch
tmp = Batol(parm->parms[2]); tmp = Batol(parm->parms[2]);
if (!(tmp==8 || tmp==16 || tmp==32)) if (!(tmp==8 || tmp==16 || tmp==32))
return OSDCMD_SHOWHELP; return OSDCMD_SHOWHELP;
newbpp = tmp; newbpp = tmp;
fallthrough__;
#endif #endif
case 2: // res switch case 2: // res switch
newx = Batol(parm->parms[0]); newx = Batol(parm->parms[0]);

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

@ -3524,6 +3524,7 @@ static int32_t defsparser(scriptfile *script)
glb->def[0].alpha = (float)(value2-a) * finv2value; glb->def[0].alpha = (float)(value2-a) * finv2value;
glb->def[1].alpha = (float)a * finv2value; glb->def[1].alpha = (float)a * finv2value;
} }
fallthrough__;
#endif #endif
case 0: case 0:
numalphatabs = value; numalphatabs = value;

6
source/build/src/engine.cpp
View file

@ -9379,8 +9379,10 @@ int32_t loadoldboard(const char *filename, char fromwhere, vec3_t *dapos, int16_
{ {
case 5: case 5:
convertv5sectv6(&v5sect,&v6sect); convertv5sectv6(&v5sect,&v6sect);
fallthrough__;
case 6: case 6:
convertv6sectv7(&v6sect,&sector[i]); convertv6sectv7(&v6sect,&sector[i]);
break;
} }
} }
@ -9426,8 +9428,10 @@ int32_t loadoldboard(const char *filename, char fromwhere, vec3_t *dapos, int16_
{ {
case 5: case 5:
convertv5wallv6(&v5wall,&v6wall,i); convertv5wallv6(&v5wall,&v6wall,i);
fallthrough__;
case 6: case 6:
convertv6wallv7(&v6wall,&wall[i]); convertv6wallv7(&v6wall,&wall[i]);
break;
} }
} }
@ -9478,8 +9482,10 @@ int32_t loadoldboard(const char *filename, char fromwhere, vec3_t *dapos, int16_
{ {
case 5: case 5:
convertv5sprv6(&v5spr,&v6spr); convertv5sprv6(&v5spr,&v6spr);
fallthrough__;
case 6: case 6:
convertv6sprv7(&v6spr,&sprite[i]); convertv6sprv7(&v6spr,&sprite[i]);
break;
} }
check_sprite(i); check_sprite(i);

5
source/build/src/miniz.c
View file

@ -2084,7 +2084,7 @@ void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int
for (y = 0; y < h; ++y) for (y = 0; y < h; ++y)
{ {
tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH); tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH);
tdefl_compress_buffer(pComp, (mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl, bpl, TDEFL_NO_FLUSH); tdefl_compress_buffer(pComp, (mz_uint8 const *)pImage + (flip ? (h - 1 - y) : y) * bpl, bpl, TDEFL_NO_FLUSH);
} }
if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE) if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE)
{ {
@ -3176,6 +3176,7 @@ struct mz_zip_internal_state_tag
#if defined(DEBUG) || defined(_DEBUG) || defined(NDEBUG) #if defined(DEBUG) || defined(_DEBUG) || defined(NDEBUG)
static MZ_FORCEINLINE mz_uint mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index) static MZ_FORCEINLINE mz_uint mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index)
{ {
pArray = pArray;
MZ_ASSERT(index < pArray->m_size); MZ_ASSERT(index < pArray->m_size);
return index; return index;
} }
@ -4805,7 +4806,7 @@ mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive
if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method))) if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
{ {
/* Decompression required, therefore intermediate read buffer required */ /* Decompression required, therefore intermediate read buffer required */
pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, MZ_ZIP_MAX_IO_BUF_SIZE); pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
if (NULL == (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)pState->read_buf_size))) if (NULL == (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)pState->read_buf_size)))
{ {
mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);

2
source/build/src/osd.cpp
View file

@ -957,6 +957,7 @@ int32_t OSD_HandleChar(char ch)
if (--editor.pos < editor.start) if (--editor.pos < editor.start)
editor.start--, editor.end--; editor.start--, editor.end--;
fallthrough__;
#ifndef __APPLE__ #ifndef __APPLE__
case 127: // handled in OSD_HandleScanCode (delete) case 127: // handled in OSD_HandleScanCode (delete)
#endif #endif
@ -2125,6 +2126,7 @@ int32_t osdcmd_cvar_set(osdfuncparm_t const * const parm)
break; break;
case CVAR_INVALIDATEALL: case CVAR_INVALIDATEALL:
gltexinvalidatetype(INVALIDATE_ALL); gltexinvalidatetype(INVALIDATE_ALL);
fallthrough__;
case CVAR_INVALIDATEART: case CVAR_INVALIDATEART:
gltexinvalidatetype(INVALIDATE_ART); gltexinvalidatetype(INVALIDATE_ART);
#ifdef POLYMER #ifdef POLYMER

2
source/build/src/polymost.cpp
View file

@ -1812,7 +1812,7 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
} }
else else
{ {
float const al = waloff[globalpicnum] ? alphahackarray[globalpicnum] * (1.f/255.f) ? alphahackarray[globalpicnum] * (1.f/255.f): float const al = waloff[globalpicnum] ? alphahackarray[globalpicnum] != 0 ? alphahackarray[globalpicnum] * (1.f/255.f):
(pth && pth->hicr && pth->hicr->alphacut >= 0.f ? pth->hicr->alphacut : 0.f) : 0.f; (pth && pth->hicr && pth->hicr->alphacut >= 0.f ? pth->hicr->alphacut : 0.f) : 0.f;
bglAlphaFunc(GL_GREATER, al); bglAlphaFunc(GL_GREATER, al);

2
source/duke3d/Dependencies.mak
View file

@ -46,7 +46,7 @@ $(DUKE3D_OBJ)/gamedef.$o: $(DUKE3D_SRC)/gamedef.cpp $(duke3d_h) $(gamedef_h) $(D
$(DUKE3D_OBJ)/gameexec.$o: $(DUKE3D_SRC)/gameexec.cpp $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h) $(DUKE3D_OBJ)/gameexec.$o: $(DUKE3D_SRC)/gameexec.cpp $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h)
$(DUKE3D_OBJ)/gamestructures.$o: $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h) $(DUKE3D_OBJ)/gamestructures.$o: $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h)
$(DUKE3D_OBJ)/gamevars.$o: $(DUKE3D_SRC)/gamevars.cpp $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h) $(DUKE3D_SRC)/savegame.h $(DUKE3D_OBJ)/gamevars.$o: $(DUKE3D_SRC)/gamevars.cpp $(DUKE3D_SRC)/gamestructures.cpp $(duke3d_h) $(gamedef_h) $(DUKE3D_SRC)/savegame.h
$(DUKE3D_OBJ)/global.$o: $(DUKE3D_SRC)/*.cpp $(DUKE3D_SRC)/global.cpp $(duke3d_h) $(DUKE3D_OBJ)/global.$o: $(DUKE3D_SRC)/global.cpp $(duke3d_h)
$(DUKE3D_OBJ)/input.$o: $(DUKE3D_SRC)/input.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h $(DUKE3D_OBJ)/input.$o: $(DUKE3D_SRC)/input.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h
$(DUKE3D_OBJ)/mdump.$o: $(DUKE3D_SRC)/mdump.cpp $(DUKE3D_SRC)/mdump.h $(DUKE3D_OBJ)/mdump.$o: $(DUKE3D_SRC)/mdump.cpp $(DUKE3D_SRC)/mdump.h
$(DUKE3D_OBJ)/menus.$o: $(DUKE3D_SRC)/menus.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h $(MACT_INC)/mouse.h $(DUKE3D_SRC)/menus.h $(DUKE3D_OBJ)/menus.$o: $(DUKE3D_SRC)/menus.cpp $(duke3d_h) $(DUKE3D_SRC)/input.h $(MACT_INC)/mouse.h $(DUKE3D_SRC)/menus.h

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

@ -2973,6 +2973,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
sprite[newSprite].yrepeat = 32; sprite[newSprite].yrepeat = 32;
DELETE_SPRITE_AND_CONTINUE(spriteNum); DELETE_SPRITE_AND_CONTINUE(spriteNum);
} }
fallthrough__;
case SHRINKSPARK__STATIC: case SHRINKSPARK__STATIC:
case RPG__STATIC: case RPG__STATIC:
case FIRELASER__STATIC: case FIRELASER__STATIC:
@ -3448,6 +3449,7 @@ ACTOR_STATIC void G_MoveTransports(void)
case STAT_ACTOR: case STAT_ACTOR:
if (sprite[sectSprite].extra > 0 && A_CheckNonTeleporting(sectSprite)) if (sprite[sectSprite].extra > 0 && A_CheckNonTeleporting(sectSprite))
goto JBOLT; goto JBOLT;
fallthrough__;
case STAT_MISC: case STAT_MISC:
case STAT_FALLER: case STAT_FALLER:
case STAT_DUMMYPLAYER: case STAT_DUMMYPLAYER:
@ -5077,9 +5079,10 @@ ACTOR_STATIC void G_MoveMisc(void) // STATNUM 5
if (pData[1] == 5) if (pData[1] == 5)
A_DeleteSprite(spriteNum); A_DeleteSprite(spriteNum);
goto next_sprite; goto next_sprite;
fallthrough__;
case FRAMEEFFECT1_13__STATIC: case FRAMEEFFECT1_13__STATIC:
if (PLUTOPAK) goto next_sprite; // JBF: ideally this should never happen... if (PLUTOPAK) goto next_sprite; // JBF: ideally this should never happen...
fallthrough__;
case FRAMEEFFECT1__STATIC: case FRAMEEFFECT1__STATIC:
if (pSprite->owner >= 0) if (pSprite->owner >= 0)
@ -5109,7 +5112,7 @@ ACTOR_STATIC void G_MoveMisc(void) // STATNUM 5
sprite[g_player[playerNum].ps->i].extra -= 4; sprite[g_player[playerNum].ps->i].extra -= 4;
} }
} }
fallthrough__;
case FIRELASER__STATIC: case FIRELASER__STATIC:
if (pSprite->extra != 5) if (pSprite->extra != 5)
pSprite->extra = 5; pSprite->extra = 5;
@ -5843,7 +5846,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
} }
} }
x = 0; // XXX: This assignment is dead? x = 0; // XXX: This assignment is dead?
fallthrough__;
case SE_14_SUBWAY_CAR: case SE_14_SUBWAY_CAR:
if (pSprite->owner==-1) if (pSprite->owner==-1)
@ -6499,6 +6502,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
case ST_26_SPLITTING_ST_DOOR: case ST_26_SPLITTING_ST_DOOR:
if (GetAnimationGoal(&sector[pSprite->sectnum].ceilingz) >= 0) if (GetAnimationGoal(&sector[pSprite->sectnum].ceilingz) >= 0)
break; break;
fallthrough__;
default: default:
G_ActivateBySector(pSprite->sectnum,spriteNum); G_ActivateBySector(pSprite->sectnum,spriteNum);
pData[0] = 0; pData[0] = 0;

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

@ -10307,6 +10307,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
// 5-frame walk // 5-frame walk
case 1550 : // Shark case 1550 : // Shark
frames=5; frames=5;
fallthrough__;
// 2-frame walk // 2-frame walk
case 1445 : // duke kick case 1445 : // duke kick
case LIZTROOPDUCKING : case LIZTROOPDUCKING :
@ -10318,7 +10319,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
case BOSS1LOB : case BOSS1LOB :
case LIZTROOPSHOOT : case LIZTROOPSHOOT :
if (frames==0) frames=2; if (frames==0) frames=2;
fallthrough__;
// 4-frame walk // 4-frame walk
case 1491 : // duke crawl case 1491 : // duke crawl
case LIZTROOP : case LIZTROOP :
@ -10331,15 +10332,18 @@ void ExtPreCheckKeys(void) // just before drawrooms
case BOSS4 : case BOSS4 :
case NEWBEAST: case NEWBEAST:
if (frames==0) frames=4; if (frames==0) frames=4;
fallthrough__;
case LIZTROOPJETPACK : case LIZTROOPJETPACK :
case DRONE : case DRONE :
case COMMANDER : case COMMANDER :
case TANK : case TANK :
case RECON : case RECON :
if (frames==0) frames = 10; if (frames==0) frames = 10;
fallthrough__;
case CAMERA1: case CAMERA1:
case APLAYER : case APLAYER :
if (frames==0) frames=1; if (frames==0) frames=1;
fallthrough__;
case GREENSLIME : case GREENSLIME :
case EGG : case EGG :
case PIGCOPSTAYPUT : case PIGCOPSTAYPUT :
@ -10525,6 +10529,7 @@ void ExtAnalyzeSprites(int32_t ourx, int32_t oury, int32_t oura, int32_t smoothr
// 5-frame walk // 5-frame walk
case 1550 : // Shark case 1550 : // Shark
frames=5; frames=5;
fallthrough__;
// 2-frame walk // 2-frame walk
case 1445 : // duke kick case 1445 : // duke kick
case LIZTROOPDUCKING : case LIZTROOPDUCKING :
@ -10536,7 +10541,7 @@ void ExtAnalyzeSprites(int32_t ourx, int32_t oury, int32_t oura, int32_t smoothr
case BOSS1LOB : case BOSS1LOB :
case LIZTROOPSHOOT : case LIZTROOPSHOOT :
if (frames==0) frames=2; if (frames==0) frames=2;
fallthrough__;
// 4-frame walk // 4-frame walk
case 1491 : // duke crawl case 1491 : // duke crawl
case LIZTROOP : case LIZTROOP :
@ -10549,16 +10554,19 @@ void ExtAnalyzeSprites(int32_t ourx, int32_t oury, int32_t oura, int32_t smoothr
case BOSS4 : case BOSS4 :
case NEWBEAST: case NEWBEAST:
if (frames==0) frames=4; if (frames==0) frames=4;
fallthrough__;
case LIZTROOPJETPACK : case LIZTROOPJETPACK :
case DRONE : case DRONE :
case COMMANDER : case COMMANDER :
case TANK : case TANK :
case RECON : case RECON :
if (frames==0) frames = 10; if (frames==0) frames = 10;
fallthrough__;
case ROTATEGUN : case ROTATEGUN :
case CAMERA1: case CAMERA1:
case APLAYER : case APLAYER :
if (frames==0) frames=1; if (frames==0) frames=1;
fallthrough__;
case GREENSLIME : case GREENSLIME :
case PIGCOPSTAYPUT : case PIGCOPSTAYPUT :
case LIZMANSTAYPUT: case LIZMANSTAYPUT:

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

@ -1594,9 +1594,11 @@ int A_Spawn(int spriteNum, int tileNum)
if (sector[sectNum].floorpicnum == FLOORSLIME || sector[sectNum].ceilingpicnum == FLOORSLIME) if (sector[sectNum].floorpicnum == FLOORSLIME || sector[sectNum].ceilingpicnum == FLOORSLIME)
pSprite->pal = 7; pSprite->pal = 7;
fallthrough__;
case DOMELITE__STATIC: case DOMELITE__STATIC:
if (pSprite->picnum == DOMELITE) if (pSprite->picnum == DOMELITE)
pSprite->cstat |= 257; pSprite->cstat |= 257;
fallthrough__;
case NEON1__STATIC: case NEON1__STATIC:
case NEON2__STATIC: case NEON2__STATIC:
case NEON3__STATIC: case NEON3__STATIC:
@ -1605,6 +1607,7 @@ int A_Spawn(int spriteNum, int tileNum)
case NEON6__STATIC: case NEON6__STATIC:
if (pSprite->picnum != WATERSPLASH2) if (pSprite->picnum != WATERSPLASH2)
pSprite->cstat |= 257; pSprite->cstat |= 257;
fallthrough__;
case NUKEBUTTON__STATIC: case NUKEBUTTON__STATIC:
case JIBS1__STATIC: case JIBS1__STATIC:
case JIBS2__STATIC: case JIBS2__STATIC:
@ -1669,6 +1672,7 @@ int A_Spawn(int spriteNum, int tileNum)
case FRAMEEFFECT1_13__STATIC: case FRAMEEFFECT1_13__STATIC:
if (PLUTOPAK) break; if (PLUTOPAK) break;
fallthrough__;
case FRAMEEFFECT1__STATIC: case FRAMEEFFECT1__STATIC:
if (spriteNum >= 0) if (spriteNum >= 0)
{ {
@ -1782,6 +1786,7 @@ int A_Spawn(int spriteNum, int tileNum)
pSprite->shade = 127; pSprite->shade = 127;
} }
pSprite->cstat |= 32; pSprite->cstat |= 32;
fallthrough__;
} }
case FECES__STATIC: case FECES__STATIC:
if (spriteNum >= 0) if (spriteNum >= 0)
@ -1901,6 +1906,7 @@ int A_Spawn(int spriteNum, int tileNum)
case PIPE6__STATIC: case PIPE6__STATIC:
pSprite->clipdist = 32; pSprite->clipdist = 32;
pSprite->cstat |= 257; pSprite->cstat |= 257;
fallthrough__;
case OCEANSPRITE4__STATIC: case OCEANSPRITE4__STATIC:
changespritestat(newSprite, STAT_DEFAULT); changespritestat(newSprite, STAT_DEFAULT);
break; break;
@ -1999,6 +2005,7 @@ int A_Spawn(int spriteNum, int tileNum)
case PODFEM1__STATIC: case PODFEM1__STATIC:
pSprite->extra <<= 1; pSprite->extra <<= 1;
fallthrough__;
case FEM1__STATIC: case FEM1__STATIC:
case FEM2__STATIC: case FEM2__STATIC:
case FEM3__STATIC: case FEM3__STATIC:
@ -2014,6 +2021,7 @@ int A_Spawn(int spriteNum, int tileNum)
case TOUGHGAL__STATIC: case TOUGHGAL__STATIC:
pSprite->yvel = pSprite->hitag; pSprite->yvel = pSprite->hitag;
pSprite->hitag = -1; pSprite->hitag = -1;
fallthrough__;
case BLOODYPOLE__STATIC: case BLOODYPOLE__STATIC:
pSprite->cstat |= 257; pSprite->cstat |= 257;
pSprite->clipdist = 32; pSprite->clipdist = 32;
@ -2035,6 +2043,7 @@ int A_Spawn(int spriteNum, int tileNum)
pSprite->shade = sprite[spriteNum].shade; pSprite->shade = sprite[spriteNum].shade;
pSprite->pal = g_player[P_Get(spriteNum)].ps->palookup; pSprite->pal = g_player[P_Get(spriteNum)].ps->palookup;
} }
fallthrough__;
case DUKECAR__STATIC: case DUKECAR__STATIC:
case HELECOPT__STATIC: case HELECOPT__STATIC:
// if(sp->picnum == HELECOPT || sp->picnum == DUKECAR) sp->xvel = 1024; // if(sp->picnum == HELECOPT || sp->picnum == DUKECAR) sp->xvel = 1024;
@ -2042,6 +2051,7 @@ int A_Spawn(int spriteNum, int tileNum)
pSprite->extra = 1; pSprite->extra = 1;
pSprite->xvel = 292; pSprite->xvel = 292;
pSprite->zvel = 360; pSprite->zvel = 360;
fallthrough__;
case BLIMP__STATIC: case BLIMP__STATIC:
pSprite->cstat |= 257; pSprite->cstat |= 257;
pSprite->clipdist = 128; pSprite->clipdist = 128;
@ -2148,6 +2158,7 @@ int A_Spawn(int spriteNum, int tileNum)
case RESPAWN__STATIC: case RESPAWN__STATIC:
pSprite->extra = 66-13; pSprite->extra = 66-13;
fallthrough__;
case MUSICANDSFX__STATIC: case MUSICANDSFX__STATIC:
if ((!g_netServer && ud.multimode < 2) && pSprite->pal == 1) if ((!g_netServer && ud.multimode < 2) && pSprite->pal == 1)
{ {
@ -2166,6 +2177,7 @@ int A_Spawn(int spriteNum, int tileNum)
G_AddGameLight(0, newSprite, ((pSprite->yrepeat*tilesiz[pSprite->picnum].y)<<1), 32768, 255+(95<<8),PR_LIGHT_PRIO_MAX_GAME); G_AddGameLight(0, newSprite, ((pSprite->yrepeat*tilesiz[pSprite->picnum].y)<<1), 32768, 255+(95<<8),PR_LIGHT_PRIO_MAX_GAME);
actor[newSprite].lightcount = 2; actor[newSprite].lightcount = 2;
} }
fallthrough__;
#endif #endif
case EXPLOSION2BOT__STATIC: case EXPLOSION2BOT__STATIC:
case BURNING__STATIC: case BURNING__STATIC:
@ -2319,6 +2331,7 @@ int A_Spawn(int spriteNum, int tileNum)
T1(newSprite) = pSprite->z; T1(newSprite) = pSprite->z;
T2(newSprite) = krand()&127; T2(newSprite) = krand()&127;
} }
fallthrough__;
case WATERDRIPSPLASH__STATIC: case WATERDRIPSPLASH__STATIC:
pSprite->xrepeat = pSprite->yrepeat = 24; pSprite->xrepeat = pSprite->yrepeat = 24;
changespritestat(newSprite, STAT_STANDABLE); changespritestat(newSprite, STAT_STANDABLE);
@ -2341,7 +2354,7 @@ int A_Spawn(int spriteNum, int tileNum)
changespritestat(newSprite, STAT_MISC); changespritestat(newSprite, STAT_MISC);
break; break;
} }
// touchplate falls through fallthrough__;
case WATERBUBBLEMAKER__STATIC: case WATERBUBBLEMAKER__STATIC:
if (EDUKE32_PREDICT_FALSE(pSprite->hitag && pSprite->picnum == WATERBUBBLEMAKER)) if (EDUKE32_PREDICT_FALSE(pSprite->hitag && pSprite->picnum == WATERBUBBLEMAKER))
{ {
@ -2378,6 +2391,7 @@ int A_Spawn(int spriteNum, int tileNum)
case COMMANDERSTAYPUT__STATIC: case COMMANDERSTAYPUT__STATIC:
case BOSS4STAYPUT__STATIC: case BOSS4STAYPUT__STATIC:
actor[newSprite].actorstayput = pSprite->sectnum; actor[newSprite].actorstayput = pSprite->sectnum;
fallthrough__;
case BOSS1__STATIC: case BOSS1__STATIC:
case BOSS2__STATIC: case BOSS2__STATIC:
case BOSS3__STATIC: case BOSS3__STATIC:
@ -2386,6 +2400,7 @@ int A_Spawn(int spriteNum, int tileNum)
case GREENSLIME__STATIC: case GREENSLIME__STATIC:
if (pSprite->picnum == GREENSLIME) if (pSprite->picnum == GREENSLIME)
pSprite->extra = 1; pSprite->extra = 1;
fallthrough__;
case DRONE__STATIC: case DRONE__STATIC:
case LIZTROOPONTOILET__STATIC: case LIZTROOPONTOILET__STATIC:
case LIZTROOPJUSTSIT__STATIC: case LIZTROOPJUSTSIT__STATIC:
@ -2666,7 +2681,7 @@ int A_Spawn(int spriteNum, int tileNum)
} }
pSprite->pal = 0; pSprite->pal = 0;
fallthrough__;
case ACCESSCARD__STATIC: case ACCESSCARD__STATIC:
if (pSprite->picnum == ATOMICHEALTH) if (pSprite->picnum == ATOMICHEALTH)
@ -2697,7 +2712,7 @@ int A_Spawn(int spriteNum, int tileNum)
case WATERFOUNTAIN__STATIC: case WATERFOUNTAIN__STATIC:
SLT(newSprite) = 1; SLT(newSprite) = 1;
fallthrough__;
case TREE1__STATIC: case TREE1__STATIC:
case TREE2__STATIC: case TREE2__STATIC:
case TIRE__STATIC: case TIRE__STATIC:
@ -2731,6 +2746,7 @@ int A_Spawn(int spriteNum, int tileNum)
pSprite->xvel = -8; pSprite->xvel = -8;
A_SetSprite(newSprite,CLIPMASK0); A_SetSprite(newSprite,CLIPMASK0);
} }
fallthrough__;
case CEILINGSTEAM__STATIC: case CEILINGSTEAM__STATIC:
changespritestat(newSprite, STAT_STANDABLE); changespritestat(newSprite, STAT_STANDABLE);
break; break;
@ -2760,6 +2776,7 @@ int A_Spawn(int spriteNum, int tileNum)
case 46: case 46:
ror_protectedsectors[pSprite->sectnum] = 1; ror_protectedsectors[pSprite->sectnum] = 1;
/* XXX: fall-through intended? */ /* XXX: fall-through intended? */
fallthrough__;
#endif #endif
case SE_49_POINT_LIGHT: case SE_49_POINT_LIGHT:
case SE_50_SPOT_LIGHT: case SE_50_SPOT_LIGHT:
@ -3102,6 +3119,7 @@ int A_Spawn(int spriteNum, int tileNum)
if (sector[sectNum].lotag && if (sector[sectNum].lotag &&
labs(sector[sectNum].ceilingz-pSprite->z) > 1024) labs(sector[sectNum].ceilingz-pSprite->z) > 1024)
sector[sectNum].lotag |= 32768; //If its open sector[sectNum].lotag |= 32768; //If its open
fallthrough__;
case SE_8_UP_OPEN_DOOR_LIGHTS: case SE_8_UP_OPEN_DOOR_LIGHTS:
//First, get the ceiling-floor shade //First, get the ceiling-floor shade
{ {
@ -3279,9 +3297,11 @@ int A_Spawn(int spriteNum, int tileNum)
if (spriteNum == -1) if (spriteNum == -1)
spriteNum = SUBWAY; spriteNum = SUBWAY;
actor[newSprite].lastv.x = spriteNum; actor[newSprite].lastv.x = spriteNum;
fallthrough__;
case SE_30_TWO_WAY_TRAIN: case SE_30_TWO_WAY_TRAIN:
if (g_netServer || numplayers > 1) if (g_netServer || numplayers > 1)
break; break;
fallthrough__;
case SE_0_ROTATING_SECTOR: case SE_0_ROTATING_SECTOR:
case SE_1_PIVOT: case SE_1_PIVOT:
case SE_5: case SE_5:
@ -3356,6 +3376,7 @@ int A_Spawn(int spriteNum, int tileNum)
case CANWITHSOMETHING4__STATIC: case CANWITHSOMETHING4__STATIC:
case RUBBERCAN__STATIC: case RUBBERCAN__STATIC:
pSprite->extra = 0; pSprite->extra = 0;
fallthrough__;
case EXPLODINGBARREL__STATIC: case EXPLODINGBARREL__STATIC:
case HORSEONSIDE__STATIC: case HORSEONSIDE__STATIC:
case FIREBARREL__STATIC: case FIREBARREL__STATIC:
@ -3371,6 +3392,7 @@ int A_Spawn(int spriteNum, int tileNum)
if (spriteNum >= 0) if (spriteNum >= 0)
pSprite->owner = spriteNum; pSprite->owner = spriteNum;
else pSprite->owner = newSprite; else pSprite->owner = newSprite;
fallthrough__;
case EGG__STATIC: case EGG__STATIC:
if (ud.monsters_off == 1 && pSprite->picnum == EGG) if (ud.monsters_off == 1 && pSprite->picnum == EGG)
{ {
@ -3613,6 +3635,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
t->shade = -127; t->shade = -127;
continue; continue;
} }
fallthrough__;
case BULLETHOLE__STATIC: case BULLETHOLE__STATIC:
case CRACK1__STATIC: case CRACK1__STATIC:
case CRACK2__STATIC: case CRACK2__STATIC:
@ -3731,6 +3754,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
case FOOTPRINTS4__STATIC: case FOOTPRINTS4__STATIC:
if (t->pal == 6) if (t->pal == 6)
t->shade = -127; t->shade = -127;
fallthrough__;
case PUKE__STATIC: case PUKE__STATIC:
case MONEY__STATIC: case MONEY__STATIC:
//case MONEY+1__STATIC: //case MONEY+1__STATIC:
@ -4047,7 +4071,7 @@ PALONLY:
} }
if (t->pal == 6) if (t->pal == 6)
t->shade = -120; t->shade = -120;
/* fall-through */ fallthrough__;
case SCRAP1__STATIC: case SCRAP1__STATIC:
case SCRAP2__STATIC: case SCRAP2__STATIC:
case SCRAP3__STATIC: case SCRAP3__STATIC:
@ -4067,6 +4091,7 @@ PALONLY:
t->pal = 7; t->pal = 7;
break; break;
} }
fallthrough__;
default: default:
G_MaybeTakeOnFloorPal(t, sect); G_MaybeTakeOnFloorPal(t, sect);
break; break;
@ -4246,6 +4271,7 @@ skip:
t->z = sprite[pSprite->owner].z-(3<<8); t->z = sprite[pSprite->owner].z-(3<<8);
if (g_tripbombLaserMode == 2 && g_player[screenpeek].ps->heat_on == 0) if (g_tripbombLaserMode == 2 && g_player[screenpeek].ps->heat_on == 0)
t->yrepeat = 0; t->yrepeat = 0;
fallthrough__;
case EXPLOSION2__STATIC: case EXPLOSION2__STATIC:
case EXPLOSION2BOT__STATIC: case EXPLOSION2BOT__STATIC:
case FREEZEBLAST__STATIC: case FREEZEBLAST__STATIC:
@ -4268,11 +4294,13 @@ skip:
case FIRE__STATIC: case FIRE__STATIC:
case FIRE2__STATIC: case FIRE2__STATIC:
t->cstat |= 128; t->cstat |= 128;
fallthrough__;
case BURNING__STATIC: case BURNING__STATIC:
case BURNING2__STATIC: case BURNING2__STATIC:
if (sprite[pSprite->owner].picnum != TREE1 && sprite[pSprite->owner].picnum != TREE2) if (sprite[pSprite->owner].picnum != TREE1 && sprite[pSprite->owner].picnum != TREE2)
t->z = actor[t->owner].floorz; t->z = actor[t->owner].floorz;
t->shade = -127; t->shade = -127;
fallthrough__;
case SMALLSMOKE__STATIC: case SMALLSMOKE__STATIC:
t->cstat |= 8192+1024; t->cstat |= 8192+1024;
break; break;
@ -4303,6 +4331,7 @@ skip:
break; break;
case SHELL__STATIC: case SHELL__STATIC:
t->picnum = pSprite->picnum+(T1(i)&1); t->picnum = pSprite->picnum+(T1(i)&1);
fallthrough__;
case SHOTGUNSHELL__STATIC: case SHOTGUNSHELL__STATIC:
t->cstat |= 12; t->cstat |= 12;
if (T1(i) > 2) t->cstat &= ~16; if (T1(i) > 2) t->cstat &= ~16;
@ -4310,6 +4339,7 @@ skip:
break; break;
case FRAMEEFFECT1_13__STATIC: case FRAMEEFFECT1_13__STATIC:
if (PLUTOPAK) break; if (PLUTOPAK) break;
fallthrough__;
case FRAMEEFFECT1__STATIC: case FRAMEEFFECT1__STATIC:
if (pSprite->owner >= 0 && sprite[pSprite->owner].statnum < MAXSTATUS) if (pSprite->owner >= 0 && sprite[pSprite->owner].statnum < MAXSTATUS)
{ {

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

@ -1435,6 +1435,7 @@ static int32_t C_SkipComments(void)
{ {
case '\n': case '\n':
g_lineNumber++; g_lineNumber++;
fallthrough__;
case ' ': case ' ':
case '\t': case '\t':
case '\r': case '\r':
@ -1491,6 +1492,7 @@ static int32_t C_SkipComments(void)
textptr++; textptr++;
continue; continue;
} }
fallthrough__;
case 0: // EOF case 0: // EOF
return ((g_scriptPtr-apScript) > (g_scriptSize-32)) ? C_SetScriptSize(g_scriptSize<<1) : 0; return ((g_scriptPtr-apScript) > (g_scriptSize-32)) ? C_SetScriptSize(g_scriptSize<<1) : 0;
} }
@ -3654,6 +3656,7 @@ DO_DEFSTATE:
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
fallthrough__;
case CON_ADDAMMO: case CON_ADDAMMO:
case CON_ADDWEAPON: case CON_ADDWEAPON:
case CON_SIZETO: case CON_SIZETO:
@ -3662,6 +3665,7 @@ DO_DEFSTATE:
case CON_ADDINVENTORY: case CON_ADDINVENTORY:
case CON_GUTS: case CON_GUTS:
C_GetNextValue(LABEL_DEFINE); C_GetNextValue(LABEL_DEFINE);
fallthrough__;
case CON_ESPAWN: case CON_ESPAWN:
case CON_ESHOOT: case CON_ESHOOT:
case CON_QSPAWN: case CON_QSPAWN:
@ -4059,6 +4063,7 @@ DO_DEFSTATE:
case CON_NEXTSPRITESECT: case CON_NEXTSPRITESECT:
case CON_SECTOROFWALL: case CON_SECTOROFWALL:
C_GetNextVarType(GAMEVAR_READONLY); C_GetNextVarType(GAMEVAR_READONLY);
fallthrough__;
case CON_ADDLOGVAR: case CON_ADDLOGVAR:
case CON_ESHOOTVAR: case CON_ESHOOTVAR:
case CON_ESPAWNVAR: case CON_ESPAWNVAR:
@ -4103,6 +4108,7 @@ DO_DEFSTATE:
case CON_SQRT: case CON_SQRT:
C_GetNextVar(); C_GetNextVar();
fallthrough__;
case CON_FINDPLAYER: case CON_FINDPLAYER:
case CON_FINDOTHERPLAYER: case CON_FINDOTHERPLAYER:
case CON_DISPLAYRAND: case CON_DISPLAYRAND:
@ -4284,6 +4290,7 @@ DO_DEFSTATE:
return 1; return 1;
} }
textptr++; textptr++;
fallthrough__;
case CON_SETARRAY: case CON_SETARRAY:
C_GetNextLabelName(); C_GetNextLabelName();
i=GetADefID(label+(g_labelCnt<<6)); i=GetADefID(label+(g_labelCnt<<6));
@ -4793,12 +4800,15 @@ DO_DEFSTATE:
{ {
case CON_SCREENTEXT: case CON_SCREENTEXT:
C_GetManyVars(8); C_GetManyVars(8);
fallthrough__;
case CON_GAMETEXTZ: case CON_GAMETEXTZ:
case CON_DIGITALNUMBERZ: case CON_DIGITALNUMBERZ:
C_GetManyVars(1); C_GetManyVars(1);
fallthrough__;
case CON_GAMETEXT: case CON_GAMETEXT:
case CON_DIGITALNUMBER: case CON_DIGITALNUMBER:
C_GetManyVars(6); C_GetManyVars(6);
fallthrough__;
default: default:
C_GetManyVars(5); C_GetManyVars(5);
break; break;
@ -6282,7 +6292,7 @@ static void C_AddDefaultDefinitions(void)
{ "GAMEARRAY_BOOLEAN", GAMEARRAY_BITMAP }, { "GAMEARRAY_BOOLEAN", GAMEARRAY_BITMAP },
}; };
for (int i = 0; i < ARRAY_SIZE(predefined); i++) for (unsigned i = 0; i < ARRAY_SIZE(predefined); i++)
C_AddDefinition(predefined[i].token, predefined[i].val, LABEL_DEFINE); C_AddDefinition(predefined[i].token, predefined[i].val, LABEL_DEFINE);
C_AddDefinition("NO", 0, LABEL_DEFINE | LABEL_ACTION | LABEL_AI | LABEL_MOVE); C_AddDefinition("NO", 0, LABEL_DEFINE | LABEL_ACTION | LABEL_AI | LABEL_MOVE);

3
source/duke3d/src/gameexec.cpp
View file

@ -2662,6 +2662,7 @@ nullquote:
case CON_EQSPAWNVAR: case CON_EQSPAWNVAR:
if (spriteNum != -1) if (spriteNum != -1)
A_AddToDeleteQueue(spriteNum); A_AddToDeleteQueue(spriteNum);
fallthrough__;
case CON_ESPAWNVAR: case CON_ESPAWNVAR:
aGameVars[g_returnVarID].global = spriteNum; aGameVars[g_returnVarID].global = spriteNum;
break; break;
@ -2693,6 +2694,7 @@ nullquote:
case CON_EQSPAWN: case CON_EQSPAWN:
if (spriteNum != -1) if (spriteNum != -1)
A_AddToDeleteQueue(spriteNum); A_AddToDeleteQueue(spriteNum);
fallthrough__;
case CON_ESPAWN: case CON_ESPAWN:
aGameVars[g_returnVarID].global = spriteNum; aGameVars[g_returnVarID].global = spriteNum;
break; break;
@ -3851,6 +3853,7 @@ nullquote:
break; break;
} }
inputPos++; inputPos++;
fallthrough__;
case 'd': case 'd':
{ {
if (argIdx >= numArgs) if (argIdx >= numArgs)

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

@ -3030,6 +3030,7 @@ repeatcase:
C_ReportError(WARNING_OUTSIDEDRAWSPRITE); C_ReportError(WARNING_OUTSIDEDRAWSPRITE);
g_numCompilerWarnings++; g_numCompilerWarnings++;
} }
fallthrough__;
case CON_RESETKEY: case CON_RESETKEY:
case CON_SETKEY: case CON_SETKEY:
case CON_INSERTSPRITE: case CON_INSERTSPRITE:
@ -3180,6 +3181,7 @@ repeatcase:
C_CUSTOMERROR("Can define quotes only at top level."); C_CUSTOMERROR("Can define quotes only at top level.");
return 1; return 1;
} }
fallthrough__;
case CON_REDEFINEQUOTE: case CON_REDEFINEQUOTE:
if (tw == CON_DEFINEQUOTE) if (tw == CON_DEFINEQUOTE)
g_scriptPtr--; g_scriptPtr--;
@ -3935,6 +3937,7 @@ void C_ReportError(int32_t iError)
case WARNING_NAMEMATCHESVAR: case WARNING_NAMEMATCHESVAR:
initprintf("%s:%d: warning: symbol `%s' already used for game variable.\n", initprintf("%s:%d: warning: symbol `%s' already used for game variable.\n",
g_szScriptFileName, g_lineNumber, tlabel); g_szScriptFileName, g_lineNumber, tlabel);
break;
case WARNING_OUTSIDEDRAWSPRITE: case WARNING_OUTSIDEDRAWSPRITE:
initprintf("%s:%d: warning: found `%s' outside of EVENT_ANALYZESPRITES\n", initprintf("%s:%d: warning: found `%s' outside of EVENT_ANALYZESPRITES\n",
g_szScriptFileName,g_lineNumber,tempbuf); g_szScriptFileName,g_lineNumber,tempbuf);

3
source/duke3d/src/m32exec.cpp
View file

@ -369,6 +369,7 @@ skip_check:
case CON_BREAK: case CON_BREAK:
vm.flags |= VMFLAG_BREAK; vm.flags |= VMFLAG_BREAK;
// XXX: may not be cleared subsequently? // XXX: may not be cleared subsequently?
fallthrough__;
case CON_ENDS: case CON_ENDS:
return 1; return 1;
@ -379,6 +380,7 @@ skip_check:
case CON_ENDSWITCH: case CON_ENDSWITCH:
vm.flags &= ~VMFLAG_BREAK; vm.flags &= ~VMFLAG_BREAK;
fallthrough__;
case CON_ENDEVENT: case CON_ENDEVENT:
insptr++; insptr++;
return 1; return 1;
@ -2644,6 +2646,7 @@ badindex:
break; break;
} }
k++; k++;
fallthrough__;
case 'd': case 'd':
{ {
char buf[16]; char buf[16];

9
source/duke3d/src/m32vars.cpp
View file

@ -109,7 +109,7 @@ void Gv_NewArray(const char *pszLabel, void *arrayptr, intptr_t asize, uint32_t
{ {
// the dummy array with index 0 sets the size to 0 so that accidental accesses as array // the dummy array with index 0 sets the size to 0 so that accidental accesses as array
// will complain. // will complain.
C_CUSTOMERROR("invalid array size %d. Must be between 1 and 65536", asize); C_CUSTOMERROR("invalid array size %d. Must be between 1 and 65536", (int)asize);
return; return;
} }
@ -335,6 +335,9 @@ int32_t __fastcall Gv_GetVarX(int32_t id)
return (VM_AccessWall(0, index, memberid, 0) ^ -negateResult) + negateResult; return (VM_AccessWall(0, index, memberid, 0) ^ -negateResult) + negateResult;
case M32_TSPRITE_VAR_ID: case M32_TSPRITE_VAR_ID:
return (VM_AccessTsprite(0, index, memberid, 0) ^ -negateResult) + negateResult; return (VM_AccessTsprite(0, index, memberid, 0) ^ -negateResult) + negateResult;
default:
M32_ERROR("Gv_GetVarX(): WTF??");
return -1;
} }
} }
case M32_FLAG_VAR: case M32_FLAG_VAR:
@ -445,6 +448,9 @@ void __fastcall Gv_SetVarX(int32_t id, int32_t lValue)
case M32_TSPRITE_VAR_ID: case M32_TSPRITE_VAR_ID:
VM_AccessTsprite(1, index, memberid, lValue); VM_AccessTsprite(1, index, memberid, lValue);
return; return;
default:
M32_ERROR("Gv_SetVarX(): WTF??");
return;
} }
} }
case M32_FLAG_VAR: case M32_FLAG_VAR:
@ -469,6 +475,7 @@ void __fastcall Gv_SetVarX(int32_t id, int32_t lValue)
return; return;
} }
} }
fallthrough__;
case GAMEVAR_INTPTR: case GAMEVAR_INTPTR:
*((int32_t *)aGameVars[id].val.lValue)=(int32_t)lValue; *((int32_t *)aGameVars[id].val.lValue)=(int32_t)lValue;
return; return;

18
source/duke3d/src/menus.cpp
View file

@ -1723,6 +1723,7 @@ static void Menu_Pre(MenuID_t cm)
case MENU_MAIN_INGAME: case MENU_MAIN_INGAME:
MenuEntry_DisableOnCondition(&ME_MAIN_SAVEGAME, ud.recstat == 2); MenuEntry_DisableOnCondition(&ME_MAIN_SAVEGAME, ud.recstat == 2);
MenuEntry_DisableOnCondition(&ME_MAIN_QUITTOTITLE, g_netServer || numplayers > 1); MenuEntry_DisableOnCondition(&ME_MAIN_QUITTOTITLE, g_netServer || numplayers > 1);
fallthrough__;
case MENU_MAIN: case MENU_MAIN:
if ((g_netServer || ud.multimode > 1) && ud.recstat != 2) if ((g_netServer || ud.multimode > 1) && ud.recstat != 2)
{ {
@ -1945,6 +1946,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
{ {
case MENU_MAIN_INGAME: case MENU_MAIN_INGAME:
l += 4; l += 4;
fallthrough__;
case MENU_MAIN: case MENU_MAIN:
rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + ((28+l)<<16), 65536L,0,INGAMEDUKETHREEDEE,0,0,10); rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + ((28+l)<<16), 65536L,0,INGAMEDUKETHREEDEE,0,0,10);
if (PLUTOPAK) // JBF 20030804 if (PLUTOPAK) // JBF 20030804
@ -2823,6 +2825,7 @@ static int32_t Menu_EntryOptionModify(MenuEntry_t *entry, int32_t newOption)
{ {
case 2: case 2:
ud.weaponswitch |= 4; ud.weaponswitch |= 4;
fallthrough__;
case 1: case 1:
ud.weaponswitch |= 1; ud.weaponswitch |= 1;
break; break;
@ -3405,6 +3408,7 @@ static void Menu_FileSelect(int32_t input)
case MENU_NETUSERMAP: case MENU_NETUSERMAP:
if ((g_netServer || ud.multimode > 1)) if ((g_netServer || ud.multimode > 1))
Net_SendUserMapName(); Net_SendUserMapName();
fallthrough__;
case MENU_USERMAP: case MENU_USERMAP:
if (input) if (input)
{ {
@ -5165,6 +5169,7 @@ static MenuEntry_t *Menu_RunInput_Menu_Movement(MenuMenu_t *menu, MenuMovement_t
{ {
case MM_End: case MM_End:
menu->currentEntry = menu->numEntries; menu->currentEntry = menu->numEntries;
fallthrough__;
case MM_Up: case MM_Up:
do do
{ {
@ -5177,6 +5182,7 @@ static MenuEntry_t *Menu_RunInput_Menu_Movement(MenuMenu_t *menu, MenuMovement_t
case MM_Home: case MM_Home:
menu->currentEntry = -1; menu->currentEntry = -1;
fallthrough__;
case MM_Down: case MM_Down:
do do
{ {
@ -5229,6 +5235,7 @@ static void Menu_RunInput_EntryOptionList_Movement(MenuOption_t *object, MenuMov
--object->options->currentEntry; --object->options->currentEntry;
if (object->options->currentEntry >= 0) if (object->options->currentEntry >= 0)
break; break;
fallthrough__;
case MM_End: case MM_End:
object->options->currentEntry = object->options->numOptions-1; object->options->currentEntry = object->options->numOptions-1;
break; break;
@ -5237,6 +5244,7 @@ static void Menu_RunInput_EntryOptionList_Movement(MenuOption_t *object, MenuMov
++object->options->currentEntry; ++object->options->currentEntry;
if (object->options->currentEntry < object->options->numOptions) if (object->options->currentEntry < object->options->numOptions)
break; break;
fallthrough__;
case MM_Home: case MM_Home:
object->options->currentEntry = 0; object->options->currentEntry = 0;
break; break;
@ -5276,6 +5284,7 @@ static int32_t Menu_RunInput_EntryOption_Movement(MenuEntry_t *entry, MenuOption
--newValueIndex; --newValueIndex;
if (newValueIndex >= 0) if (newValueIndex >= 0)
break; break;
fallthrough__;
case MM_AllTheWayRight: case MM_AllTheWayRight:
newValueIndex = object->options->numOptions-1; newValueIndex = object->options->numOptions-1;
break; break;
@ -5284,6 +5293,7 @@ static int32_t Menu_RunInput_EntryOption_Movement(MenuEntry_t *entry, MenuOption
++newValueIndex; ++newValueIndex;
if (newValueIndex < object->options->numOptions) if (newValueIndex < object->options->numOptions)
break; break;
fallthrough__;
case MM_AllTheWayLeft: case MM_AllTheWayLeft:
newValueIndex = 0; newValueIndex = 0;
break; break;
@ -5362,6 +5372,7 @@ static void Menu_RunInput_EntryRangeInt32_Movement(MenuEntry_t *entry, MenuRange
--newValueIndex; --newValueIndex;
if (newValueIndex >= 0) if (newValueIndex >= 0)
break; break;
fallthrough__;
case MM_AllTheWayLeft: case MM_AllTheWayLeft:
newValueIndex = 0; newValueIndex = 0;
break; break;
@ -5371,6 +5382,7 @@ static void Menu_RunInput_EntryRangeInt32_Movement(MenuEntry_t *entry, MenuRange
++newValueIndex; ++newValueIndex;
if (newValueIndex < object->steps) if (newValueIndex < object->steps)
break; break;
fallthrough__;
case MM_AllTheWayRight: case MM_AllTheWayRight:
newValueIndex = object->steps-1; newValueIndex = object->steps-1;
break; break;
@ -5418,6 +5430,7 @@ static void Menu_RunInput_EntryRangeFloat_Movement(MenuEntry_t *entry, MenuRange
--newValueIndex; --newValueIndex;
if (newValueIndex >= 0) if (newValueIndex >= 0)
break; break;
fallthrough__;
case MM_AllTheWayLeft: case MM_AllTheWayLeft:
newValueIndex = 0; newValueIndex = 0;
break; break;
@ -5427,6 +5440,7 @@ static void Menu_RunInput_EntryRangeFloat_Movement(MenuEntry_t *entry, MenuRange
++newValueIndex; ++newValueIndex;
if (newValueIndex < object->steps) if (newValueIndex < object->steps)
break; break;
fallthrough__;
case MM_AllTheWayRight: case MM_AllTheWayRight:
newValueIndex = object->steps-1; newValueIndex = object->steps-1;
break; break;
@ -5471,6 +5485,7 @@ static void Menu_RunInput_EntryRangeDouble_Movement(/*MenuEntry_t *entry, */Menu
--newValueIndex; --newValueIndex;
if (newValueIndex >= 0) if (newValueIndex >= 0)
break; break;
fallthrough__;
case MM_AllTheWayLeft: case MM_AllTheWayLeft:
newValueIndex = 0; newValueIndex = 0;
break; break;
@ -5480,6 +5495,7 @@ static void Menu_RunInput_EntryRangeDouble_Movement(/*MenuEntry_t *entry, */Menu
++newValueIndex; ++newValueIndex;
if (newValueIndex < object->steps) if (newValueIndex < object->steps)
break; break;
fallthrough__;
case MM_AllTheWayRight: case MM_AllTheWayRight:
newValueIndex = object->steps-1; newValueIndex = object->steps-1;
break; break;
@ -5548,6 +5564,7 @@ static void Menu_RunInput_FileSelect_Movement(MenuFileSelect_t *object, MenuMove
object->findhigh[object->currentList] = object->findhigh[object->currentList]->prev; object->findhigh[object->currentList] = object->findhigh[object->currentList]->prev;
break; break;
} }
fallthrough__;
case MM_End: case MM_End:
object->findhigh[object->currentList] = object->findhigh[object->currentList]->userb; object->findhigh[object->currentList] = object->findhigh[object->currentList]->userb;
break; break;
@ -5560,6 +5577,7 @@ static void Menu_RunInput_FileSelect_Movement(MenuFileSelect_t *object, MenuMove
object->findhigh[object->currentList] = object->findhigh[object->currentList]->next; object->findhigh[object->currentList] = object->findhigh[object->currentList]->next;
break; break;
} }
fallthrough__;
case MM_Home: case MM_Home:
object->findhigh[object->currentList] = object->findhigh[object->currentList]->usera; object->findhigh[object->currentList] = object->findhigh[object->currentList]->usera;
break; break;

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

@ -513,15 +513,19 @@ static int32_t osdcmd_spawn(osdfuncparm_t const * const parm)
vect.y = Batol(parm->parms[5]); vect.y = Batol(parm->parms[5]);
vect.z = Batol(parm->parms[6]); vect.z = Batol(parm->parms[6]);
set |= 8; set |= 8;
fallthrough__;
case 4: // ang case 4: // ang
ang = Batol(parm->parms[3]) & 2047; ang = Batol(parm->parms[3]) & 2047;
set |= 4; set |= 4;
fallthrough__;
case 3: // cstat case 3: // cstat
cstat = (uint16_t)Batol(parm->parms[2]); cstat = (uint16_t)Batol(parm->parms[2]);
set |= 2; set |= 2;
fallthrough__;
case 2: // pal case 2: // pal
pal = (uint8_t)Batol(parm->parms[1]); pal = (uint8_t)Batol(parm->parms[1]);
set |= 1; set |= 1;
fallthrough__;
case 1: // tile number case 1: // tile number
if (isdigit(parm->parms[0][0])) if (isdigit(parm->parms[0][0]))
{ {

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

@ -1287,7 +1287,9 @@ static int32_t A_ShootHardcoded(int spriteNum, int projecTile, int shootAng, vec
return returnSprite; return returnSprite;
} }
case FREEZEBLAST__STATIC: startPos.z += (3 << 8); case FREEZEBLAST__STATIC:
startPos.z += (3 << 8);
fallthrough__;
case RPG__STATIC: case RPG__STATIC:
{ {
// XXX: "CODEDUP" // XXX: "CODEDUP"
@ -2282,6 +2284,7 @@ void P_DisplayWeapon(void)
case 2: case 2:
G_DrawWeaponTileWithID(currentWeapon << 1, weaponX + 168 - halfLookAng, weaponY + 201 - weaponYOffset, G_DrawWeaponTileWithID(currentWeapon << 1, weaponX + 168 - halfLookAng, weaponY + 201 - weaponYOffset,
SHOTGUN + 2, -128, weaponBits, weaponPal, 0); SHOTGUN + 2, -128, weaponBits, weaponPal, 0);
fallthrough__;
case 0: case 0:
case 6: case 6:
case 7: case 7:
@ -2297,6 +2300,7 @@ void P_DisplayWeapon(void)
G_DrawWeaponTileWithID(currentWeapon << 1, weaponX + 178 - halfLookAng, weaponY + 194 - weaponYOffset, G_DrawWeaponTileWithID(currentWeapon << 1, weaponX + 178 - halfLookAng, weaponY + 194 - weaponYOffset,
SHOTGUN + 1 + ((*(weaponFrame)-1) >> 1), -128, weaponBits, weaponPal, 0); SHOTGUN + 1 + ((*(weaponFrame)-1) >> 1), -128, weaponBits, weaponPal, 0);
fallthrough__;
case 5: case 5:
case 9: case 9:
case 10: case 10:

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

@ -1246,7 +1246,7 @@ static void prelevel(char g)
if (pWall->lotag && pWall->nextwall >= 0) if (pWall->lotag && pWall->nextwall >= 0)
wall[pWall->nextwall].lotag = pWall->lotag; wall[pWall->nextwall].lotag = pWall->lotag;
fallthrough__;
case BIGFORCE__STATIC: case BIGFORCE__STATIC:
animwall[g_animWallCnt].wallnum = i; animwall[g_animWallCnt].wallnum = i;
g_animWallCnt++; g_animWallCnt++;

1
source/duke3d/src/screens.cpp
View file

@ -2262,6 +2262,7 @@ void G_BonusScreen(int32_t bonusonly)
break; break;
} }
} }
fallthrough__;
case 1: case 1:
case 4: case 4:
case 5: case 5:

1
source/duke3d/src/screentext.cpp
View file

@ -127,6 +127,7 @@ int32_t G_GetStringTile(int32_t font, char *t, int32_t f)
break; break;
default: // unknown character default: // unknown character
*t = ' '; // whitespace-ize *t = ' '; // whitespace-ize
fallthrough__;
case '\n': case '\n':
return font; return font;
break; break;

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

@ -1255,7 +1255,7 @@ int P_ActivateSwitch(int playerNum, int wallOrSprite, int switchType)
return 0; return 0;
} }
/* fall-through (XXX: intended?) */ fallthrough__;
case MULTISWITCH__STATIC: case MULTISWITCH__STATIC:
case REST_SWITCH_CASES: case REST_SWITCH_CASES:
if (G_CheckActivatorMotion(lotag)) if (G_CheckActivatorMotion(lotag))
@ -2614,6 +2614,7 @@ CHECKINV1:
case HANDREMOTE_WEAPON: case HANDREMOTE_WEAPON:
i = currentWeapon = HANDBOMB_WEAPON; i = currentWeapon = HANDBOMB_WEAPON;
fallthrough__;
default: default:
currentWeapon += weaponNum; currentWeapon += weaponNum;
break; break;
@ -2703,6 +2704,7 @@ CHECKINV1:
pPlayer->last_full_weapon = pPlayer->curr_weapon; pPlayer->last_full_weapon = pPlayer->curr_weapon;
pPlayer->show_empty_weapon = 32; pPlayer->show_empty_weapon = 32;
} }
fallthrough__;
case KNEE_WEAPON: case KNEE_WEAPON:
case HANDREMOTE_WEAPON: case HANDREMOTE_WEAPON:
P_AddWeapon(pPlayer, weaponNum, 1); P_AddWeapon(pPlayer, weaponNum, 1);

3
source/mact/src/scriplib.cpp
View file

@ -326,6 +326,7 @@ int32_t SCRIPT_ParseBuffer(int32_t scripthandle, char *data, int32_t length)
case ParsingSectionBegin: case ParsingSectionBegin:
currentsection = dp = sp; currentsection = dp = sp;
state = ParsingSectionName; state = ParsingSectionName;
fallthrough__;
case ParsingSectionName: case ParsingSectionName:
LETTER(); LETTER();
switch (ch) switch (ch)
@ -360,6 +361,7 @@ int32_t SCRIPT_ParseBuffer(int32_t scripthandle, char *data, int32_t length)
EATLINE(sp); EATLINE(sp);
printf("Unexpected comment on line %d.\n", linenum); printf("Unexpected comment on line %d.\n", linenum);
SETRV(-1); SETRV(-1);
fallthrough__;
case '\n': case '\n':
case '\r': case '\r':
// Unexpected newline // Unexpected newline
@ -385,6 +387,7 @@ int32_t SCRIPT_ParseBuffer(int32_t scripthandle, char *data, int32_t length)
case ParsingValueBegin: case ParsingValueBegin:
currentvalue = dp = sp; currentvalue = dp = sp;
state = ParsingValue; state = ParsingValue;
fallthrough__;
case ParsingValue: case ParsingValue:
LETTER(); LETTER();
switch (ch) switch (ch)