From 341139ea73ea419d506d583daf63c8028a6830df Mon Sep 17 00:00:00 2001
From: Lactozilla <jp6781615@gmail.com>
Date: Wed, 22 May 2024 23:37:09 -0300
Subject: [PATCH] Scale the vertical offsets
---
src/p_maputl.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/p_maputl.c b/src/p_maputl.c
index f00534d639..0bc22390b1 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -500,8 +500,11 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
INT32 texnum = R_GetTextureNum(side->midtexture); // make sure the texture is actually valid
if (texnum) {
+ fixed_t scaley = abs(side->scaley_mid);
+ fixed_t offsetvalue = FixedDiv(side->rowoffset + side->offsety_mid, scaley);
+
// Get the midtexture's height
- texheight = FixedDiv(textureheight[texnum], abs(side->scaley_mid));
+ texheight = FixedDiv(textureheight[texnum], scaley);
// Set texbottom and textop to the Z coordinates of the texture's boundaries
#if 0
@@ -509,26 +512,26 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
// on non-solid polyobjects should NEVER happen in the future
if (linedef->polyobj && (linedef->polyobj->flags & POF_TESTHEIGHT)) {
if (linedef->flags & ML_WRAPMIDTEX && !side->repeatcnt) { // "infinite" repeat
- texbottom = back->floorheight + side->rowoffset + side->offsety_mid;
- textop = back->ceilingheight + side->rowoffset + side->offsety_mid;
+ texbottom = back->floorheight + offsetvalue;
+ textop = back->ceilingheight + offsetvalue;
} else if (linedef->flags & ML_MIDTEX) {
- texbottom = back->floorheight + side->rowoffset + side->offsety_mid;
+ texbottom = back->floorheight + offsetvalue;
textop = texbottom + texheight*(side->repeatcnt+1);
} else {
- textop = back->ceilingheight + side->rowoffset + side->offsety_mid;
+ textop = back->ceilingheight + offsetvalue;
texbottom = textop - texheight*(side->repeatcnt+1);
}
} else
#endif
{
if (linedef->flags & ML_WRAPMIDTEX && !side->repeatcnt) { // "infinite" repeat
- texbottom = openbottom + side->rowoffset + side->offsety_mid;
- textop = opentop + side->rowoffset + side->offsety_mid;
+ texbottom = openbottom + offsetvalue;
+ textop = opentop + offsetvalue;
} else if (linedef->flags & ML_MIDPEG) {
- texbottom = openbottom + side->rowoffset + side->offsety_mid;
+ texbottom = openbottom + offsetvalue;
textop = texbottom + texheight*(side->repeatcnt+1);
} else {
- textop = opentop + side->rowoffset + side->offsety_mid;
+ textop = opentop + offsetvalue;
texbottom = textop - texheight*(side->repeatcnt+1);
}
}
--
GitLab