stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-22 20:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-523' into 'next'

Browse source 
Fix object collision with solid noskew midtextures (resolves #523)

Closes #523

See merge request STJr/SRB2!2447
This commit is contained in:
sphere 2024-06-03 22:38:53 +00:00
commit 0f479f602e
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/p_maputl.c
View file

@ -502,6 +502,19 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
if (texnum) { if (texnum) {
fixed_t scaley = abs(side->scaley_mid); fixed_t scaley = abs(side->scaley_mid);
fixed_t offsetvalue = FixedDiv(side->rowoffset + side->offsety_mid, scaley); fixed_t offsetvalue = FixedDiv(side->rowoffset + side->offsety_mid, scaley);
fixed_t midopentop, midopenbottom;
if (linedef->flags & ML_NOSKEW)
{
// Use the sector's actual heights if the midtexture is not skewed
midopentop = min(front->ceilingheight, back->ceilingheight);
midopenbottom = max(front->floorheight, back->floorheight);
}
else
{
midopentop = opentop;
midopenbottom = openbottom;
}
// Get the midtexture's height // Get the midtexture's height
texheight = FixedDiv(textureheight[texnum], scaley); texheight = FixedDiv(textureheight[texnum], scaley);
@ -525,13 +538,13 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
#endif #endif
{ {
if (linedef->flags & ML_WRAPMIDTEX && !side->repeatcnt) { // "infinite" repeat if (linedef->flags & ML_WRAPMIDTEX && !side->repeatcnt) { // "infinite" repeat
texbottom = openbottom + offsetvalue; texbottom = midopenbottom + offsetvalue;
textop = opentop + offsetvalue; textop = midopentop + offsetvalue;
} else if (linedef->flags & ML_MIDPEG) { } else if (linedef->flags & ML_MIDPEG) {
texbottom = openbottom + offsetvalue; texbottom = midopenbottom + offsetvalue;
textop = texbottom + texheight*(side->repeatcnt+1); textop = texbottom + texheight*(side->repeatcnt+1);
} else { } else {
textop = opentop + offsetvalue; textop = midopentop + offsetvalue;
texbottom = textop - texheight*(side->repeatcnt+1); texbottom = textop - texheight*(side->repeatcnt+1);
} }
} }
@ -545,7 +558,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
if (opentop > texbottom) { if (opentop > texbottom) {
opentop = texbottom; opentop = texbottom;
if (linedef->flags & ML_NOSKEW) if (linedef->flags & ML_NOSKEW)
opentopslope = NULL; opentopslope = NULL; // Object is not actually on a slope
else else
opentopslope = linedef->midtexslope; opentopslope = linedef->midtexslope;
} }
@ -553,7 +566,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
if (openbottom < textop) { if (openbottom < textop) {
openbottom = textop; openbottom = textop;
if (linedef->flags & ML_NOSKEW) if (linedef->flags & ML_NOSKEW)
openbottomslope = NULL; openbottomslope = NULL; // Object is not actually on a slope
else else
openbottomslope = linedef->midtexslope; openbottomslope = linedef->midtexslope;
} }