Skip to content

Commit baee489

Browse files
committed
Disabled currently the polyobject-with-special-lines travels-into-thing implementation
Not foolproof, hard to fix, we have more immediate bugs on this to fix
1 parent 067d476 commit baee489

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

source/polyobj.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,7 @@ inline static bool lineCanCarry(const line_t &line)
907907
}
908908

909909
// When passable polyobject with special lines passes through a still thing, activate them
910+
#if 0
910911
static void Polyobj_makeThingCrossSpecialLine(Mobj &mo, line_t &line, const divline_t &oldLinePos)
911912
{
912913
if(!line.special)
@@ -920,6 +921,7 @@ static void Polyobj_makeThingCrossSpecialLine(Mobj &mo, line_t &line, const divl
920921
P_CrossSpecialLine(&line, oldside, &mo, nullptr);
921922
}
922923
}
924+
#endif
923925

924926
//
925927
// Polyobj_clipThings
@@ -965,14 +967,14 @@ static bool Polyobj_clipThings(polyobj_t *po, line_t *line, const divline_t &old
965967
if((mo->z >= textop - STEPSIZE && mo->zref.ceiling - textop >= mo->height) ||
966968
mo->z + mo->height <= texbot)
967969
{
968-
Polyobj_makeThingCrossSpecialLine(*mo, *line, oldLinePos);
970+
// Polyobj_makeThingCrossSpecialLine(*mo, *line, oldLinePos);
969971
continue;
970972
}
971973
}
972974
else if(!P_LevelIsVanillaHexen() && !(line->flags & ML_BLOCKING) && (line->flags & ML_TWOSIDED) &&
973975
line->backsector && P_TryMove(mo, mo->x, mo->y, 1))
974976
{
975-
Polyobj_makeThingCrossSpecialLine(*mo, *line, oldLinePos);
977+
// Polyobj_makeThingCrossSpecialLine(*mo, *line, oldLinePos);
976978
continue;
977979
}
978980

0 commit comments

Comments
 (0)