From 88a616da7585f317ce7b1a4651dffc1b2a36e1c6 Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Sat, 23 Jan 2016 19:33:26 -0500 Subject: [PATCH] - Removed what appears to be a debug breakpoint. - Cleared some GCC and Clang warnings. Mostly static analysis false positives, but one of them generated a pretty massive warning in a release build. - Use -Wno-unused-result since I doubt we're going to address those unless they actually prove to be a problem (and they only appear in release builds). --- dumb/CMakeLists.txt | 2 +- src/CMakeLists.txt | 3 +- src/p_mobj.cpp | 2 +- src/p_pspr.cpp | 2 +- src/p_spec.cpp | 2 +- src/p_teleport.cpp | 2 +- src/r_data/r_interpolate.cpp | 2 - src/s_sound.cpp | 83 +++++++++++++++++++----------------- src/v_font.cpp | 4 +- 9 files changed, 53 insertions(+), 49 deletions(-) diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt index b590aa1655..fd8cdd9686 100644 --- a/dumb/CMakeLists.txt +++ b/dumb/CMakeLists.txt @@ -8,7 +8,7 @@ include( CheckCXXCompilerFlag ) set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DDEBUGMODE=1" ) if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-pointer-sign -Wno-uninitialized" ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-pointer-sign -Wno-uninitialized -Wno-unused-but-set-variable" ) endif( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) CHECK_FUNCTION_EXISTS( itoa ITOA_EXISTS ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e161a85dd7..70890c5fc5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -456,7 +456,8 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) set( CMAKE_CXX_FLAGS_MINSIZEREL "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_MINSIZEREL}" ) set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" ) - set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result ${CMAKE_C_FLAGS}" ) + set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result ${CMAKE_CXX_FLAGS}" ) # Remove extra warnings when using the official DirectX headers. # Also, TDM-GCC 4.4.0 no longer accepts glibc-style printf formats as valid, diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 32a20e3214..67f7d16854 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -5939,7 +5939,7 @@ AActor *P_SpawnPlayerMissile (AActor *source, fixed_t x, fixed_t y, fixed_t z, const PClass *type, angle_t angle, AActor **pLineTarget, AActor **pMissileActor, bool nofreeaim, bool noautoaim) { - static const int angdiff[3] = { -1<<26, 1<<26, 0 }; + static const int angdiff[3] = { -(1<<26), 1<<26, 0 }; angle_t an = angle; angle_t pitch; AActor *linetarget; diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 7cdef059cb..0ced8f004b 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -891,7 +891,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AInventory, A_GunFlash) angle_t P_BulletSlope (AActor *mo, AActor **pLineTarget) { - static const int angdiff[3] = { -1<<26, 1<<26, 0 }; + static const int angdiff[3] = { -(1<<26), 1<<26, 0 }; int i; angle_t an; angle_t pitch; diff --git a/src/p_spec.cpp b/src/p_spec.cpp index 2cb3222781..0dcf5124a5 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -1223,7 +1223,7 @@ void P_InitSectorSpecial(sector_t *sector, int special, bool nothinkers) if (!nothinkers) { new DStrobe(sector, STROBEBRIGHT, FASTDARK, false); - new DScroller(DScroller::sc_floor, (-FRACUNIT / 2) << 3, + new DScroller(DScroller::sc_floor, -((FRACUNIT / 2) << 3), 0, -1, int(sector - sectors), 0); } keepspecial = true; diff --git a/src/p_teleport.cpp b/src/p_teleport.cpp index ab860bfe9b..85b668bf00 100644 --- a/src/p_teleport.cpp +++ b/src/p_teleport.cpp @@ -108,7 +108,7 @@ bool P_Teleport (AActor *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, sector_t *destsect; bool resetpitch = false; fixed_t floorheight, ceilingheight; - fixed_t missilespeed; + fixed_t missilespeed = 0; old = thing->Pos(); aboveFloor = thing->Z() - thing->floorz; diff --git a/src/r_data/r_interpolate.cpp b/src/r_data/r_interpolate.cpp index 82e27abb48..4ce3a3c7b3 100644 --- a/src/r_data/r_interpolate.cpp +++ b/src/r_data/r_interpolate.cpp @@ -447,8 +447,6 @@ void DSectorPlaneInterpolation::UpdateInterpolation() oldheight = sector->ceilingplane.d; oldtexz = sector->GetPlaneTexZ(sector_t::ceiling); } - if (oldtexz <-128*FRACUNIT) - __asm nop } //========================================================================== diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 2a9703ae42..c05ef10366 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -676,52 +676,55 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector, z = y = x = 0; } - switch (type) + // [BL] Moved this case out of the switch statement to make code easier + // on static analysis. + if(type == SOURCE_Unattached) { - case SOURCE_None: - default: - break; - - case SOURCE_Actor: -// assert(actor != NULL); - if (actor != NULL) - { - x = actor->SoundX(); - y = actor->SoundZ(); - z = actor->SoundY(); - } - break; - - case SOURCE_Sector: - assert(sector != NULL); - if (sector != NULL) - { - if (chanflags & CHAN_AREA) - { - CalcSectorSoundOrg(sector, channum, &x, &z, &y); - } - else - { - x = sector->soundorg[0]; - z = sector->soundorg[1]; - chanflags |= CHAN_LISTENERZ; - } - } - break; - - case SOURCE_Polyobj: - assert(poly != NULL); - CalcPolyobjSoundOrg(poly, &x, &z, &y); - break; - - case SOURCE_Unattached: pos->X = pt[0]; pos->Y = !(chanflags & CHAN_LISTENERZ) ? pt[1] : FIXED2FLOAT(y); pos->Z = pt[2]; - break; } - if (type != SOURCE_Unattached) + else { + switch (type) + { + case SOURCE_None: + default: + break; + + case SOURCE_Actor: + //assert(actor != NULL); + if (actor != NULL) + { + x = actor->SoundX(); + y = actor->SoundZ(); + z = actor->SoundY(); + } + break; + + case SOURCE_Sector: + assert(sector != NULL); + if (sector != NULL) + { + if (chanflags & CHAN_AREA) + { + CalcSectorSoundOrg(sector, channum, &x, &z, &y); + } + else + { + x = sector->soundorg[0]; + z = sector->soundorg[1]; + chanflags |= CHAN_LISTENERZ; + } + } + break; + + case SOURCE_Polyobj: + assert(poly != NULL); + CalcPolyobjSoundOrg(poly, &x, &z, &y); + break; + } + if ((chanflags & CHAN_LISTENERZ) && players[consoleplayer].camera != NULL) { y = players[consoleplayer].camera != NULL ? players[consoleplayer].camera->SoundZ() : 0; diff --git a/src/v_font.cpp b/src/v_font.cpp index 5fc2994fb8..e30f8352d2 100644 --- a/src/v_font.cpp +++ b/src/v_font.cpp @@ -1059,7 +1059,9 @@ void FSingleLumpFont::LoadTranslations() break; default: - break; + // Should be unreachable. + I_Error("Unknown font type in FSingleLumpFont::LoadTranslation."); + return; } for(unsigned int i = 0;i < count;++i)