From 66201620dd3477459e76e123060e10ba363f501e Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Sat, 7 Oct 2017 13:21:12 -0400 Subject: [PATCH] cleanup a few compiler warnings --- src/hardware/hw_clip.c | 2 +- src/m_cheat.c | 2 +- src/p_mobj.c | 4 ++-- src/st_stuff.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hardware/hw_clip.c b/src/hardware/hw_clip.c index 8b01cabd5..fd6ba13f3 100644 --- a/src/hardware/hw_clip.c +++ b/src/hardware/hw_clip.c @@ -338,7 +338,7 @@ angle_t gld_FrustumAngle(void) } // If the pitch is larger than this you can look all around at a FOV of 90 - if (abs(aimingangle) > 46 * ANG1) + if (aimingangle > (ANGLE_45+ANG1) && (ANGLE_315-ANG1) > aimingangle) return 0xffffffff; // ok, this is a gross hack that barely works... diff --git a/src/m_cheat.c b/src/m_cheat.c index 3308f721c..76733a82f 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -1255,7 +1255,7 @@ void Command_ObjectPlace_f(void) { objectplacing = true; - if ((players[0].powers[pw_carry] == CR_NIGHTSMODE)) + if (players[0].powers[pw_carry] == CR_NIGHTSMODE) return; if (!COM_CheckParm("-silent")) diff --git a/src/p_mobj.c b/src/p_mobj.c index 10bdee2bc..c22b81795 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6890,9 +6890,9 @@ void P_MobjThinker(mobj_t *mobj) P_SetScale(mobj, mobj->target->scale); if (!(mobj->eflags & MFE_VERTICALFLIP)) - mobj->z = mobj->target->z + mobj->target->height + FixedMul((16 + abs((leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale); + mobj->z = mobj->target->z + mobj->target->height + FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale); else - mobj->z = mobj->target->z - FixedMul((16 + abs((leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale) - mobj->height; + mobj->z = mobj->target->z - FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale) - mobj->height; break; case MT_DROWNNUMBERS: if (!mobj->target) diff --git a/src/st_stuff.c b/src/st_stuff.c index ceef586a4..ebd0034dd 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -2066,7 +2066,7 @@ static void ST_overlayDrawer(void) V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132)-(splitscreen ? 12 : 0), V_HUDTRANSHALF, M_GetText("You'll steal a life on respawn.")); } } - else if (!gametype == GT_COOP) + else if (gametype != GT_COOP) V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), V_HUDTRANSHALF, M_GetText("Press Fire to enter the game.")); if (!splitscreen) {