From 2ae5c6d9fcdf655e7fc0d28e884daabb11bebf60 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Thu, 6 Jun 2024 00:34:45 +0200
Subject: [PATCH] Fix build warnings
---
src/hardware/hw_main.c | 2 +-
src/p_maputl.c | 1 -
src/r_things.c | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 5f957ccc2f..09f1d44d50 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1788,7 +1788,7 @@ static void HWR_RenderExtraTexture(unsigned which, side_t *side, sector_t *sec_f
static void HWR_RenderFFloorExtraTextures(ffloor_t *pfloor, v2d_t vs, v2d_t ve, float xcliplow, float xcliphigh, boolean use_3dfloor_blend, FSurfaceInfo Surf, FBITFIELD blendmode)
{
- side_t *pside = R_GetFFloorSide(gl_curline, pfloor);
+ side_t *pside = R_GetFFloorSide(gl_curline->linedef, pfloor, pfloor->target);
sector_t *psector = pfloor->master->frontsector;
if (use_3dfloor_blend)
diff --git a/src/p_maputl.c b/src/p_maputl.c
index da2b99b5b0..200b89cff9 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -498,7 +498,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
fixed_t textop, texbottom, texheight;
fixed_t texmid, delta1, delta2;
INT32 texnum = R_GetTextureNum(side->midtexture); // make sure the texture is actually valid
- boolean wrapmidtex = linedef->flags & ML_WRAPMIDTEX || side->flags & SIDEFLAG_WRAP_MIDTEX;
if (texnum) {
fixed_t scaley = abs(side->scaley_mid);
diff --git a/src/r_things.c b/src/r_things.c
index b8011ed687..24d77e9c90 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2948,7 +2948,7 @@ static fixed_t R_GetLowestSidedefTexture(side_t *side)
static fixed_t R_GetFFloorTopZAt(const drawseg_t *ds, const ffloor_t *pfloor, fixed_t x, fixed_t y)
{
- side_t *side = R_GetFFloorSide(ds->curline, pfloor);
+ side_t *side = R_GetFFloorSide(ds->curline->linedef, pfloor, pfloor->target);
if (side->flags & SIDEFLAG_HASEDGETEXTURES)
return P_GetFFloorTopZAt(pfloor, x, y) + R_GetHighestSidedefTexture(side);
@@ -2957,7 +2957,7 @@ static fixed_t R_GetFFloorTopZAt(const drawseg_t *ds, const ffloor_t *pfloor, fi
static fixed_t R_GetFFloorBottomZAt(const drawseg_t *ds, const ffloor_t *pfloor, fixed_t x, fixed_t y)
{
- side_t *side = R_GetFFloorSide(ds->curline, pfloor);
+ side_t *side = R_GetFFloorSide(ds->curline->linedef, pfloor, pfloor->target);
if (side->flags & SIDEFLAG_HASEDGETEXTURES)
return P_GetFFloorBottomZAt(pfloor, x, y) - R_GetLowestSidedefTexture(side);
--
GitLab