diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index e8938c441..871b1ccc3 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -707,7 +707,7 @@ static void HWR_RenderPlane(subsector_t *subsector, poly_subsector_t *xsub, bool vert->z = (vy);\ \ } - for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++, pv++) + for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++, v3d++, pv++) SETUP3DVERT(v3d, pv->x, pv->y); if (slope) diff --git a/src/k_hud.c b/src/k_hud.c index 208a93d45..c5e8da8cb 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -4455,7 +4455,7 @@ static void K_drawLapStartAnim(void) char *lapnum = va("%02d", stplyr->laps + 1); const size_t laplength = strlen(lapnum); - for (int i = 0; i < (int)laplength; i++) + for (size_t i = 0; i < laplength; i++) { int digit = lapnum[i] - '0'; int frame = min(2, progress/2 - 8 - (i*2)); diff --git a/src/p_mobj.c b/src/p_mobj.c index 4be86822b..3057dfc93 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -935,7 +935,12 @@ static void P_PlayerFlip(mobj_t *mo) G_GhostAddFlip((INT32) (mo->player - players)); // Flip aiming to match! - if (mo->player->pflags & PF_FLIPCAM) + if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam + { + if (mo->tracer) + mo->tracer->eflags ^= MFE_VERTICALFLIP; + } + else if (mo->player->pflags & PF_FLIPCAM) { UINT8 i; @@ -957,11 +962,6 @@ static void P_PlayerFlip(mobj_t *mo) camera[i].z += FixedMul(20*FRACUNIT, mo->scale); } } - else if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam - { - if (mo->tracer) - mo->tracer->eflags ^= MFE_VERTICALFLIP; - } } // diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index 60d84c57f..a3e67a5e3 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -221,8 +221,9 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, tempsec->floorheight = s->floorheight; tempsec->ceilingheight = s->ceilingheight; - if ((underwater && (tempsec-> floorheight = sec->floorheight, - tempsec->ceilingheight = s->floorheight - 1, !back)) || viewz <= s->floorheight) + if ((underwater && (tempsec->floorheight = sec->floorheight, + tempsec->ceilingheight = s->floorheight - 1, !back)) || + viewz <= s->floorheight) { // head-below-floor hack tempsec->floorpic = s->floorpic; tempsec->floor_xoffs = s->floor_xoffs; @@ -258,8 +259,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, *ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel : sectors[s->ceilinglightsec].lightlevel; } - else if (heightsec != -1 && viewz >= sectors[heightsec].ceilingheight - && sec->ceilingheight > s->ceilingheight) + else if (heightsec != -1 && viewz >= sectors[heightsec].ceilingheight && + sec->ceilingheight > s->ceilingheight) { // Above-ceiling hack tempsec->ceilingheight = s->ceilingheight; tempsec->floorheight = s->ceilingheight + 1; @@ -296,7 +297,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel, *ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel : sectors[s->ceilinglightsec].lightlevel; } - sec = tempsec; + + sec = tempsec; // Use other sector } return sec;