Error fixes

* Consolidated with demo_version 406 checks
* Fix broken msecnode flag update
* Fix lack of link offsets
* Remove trailing whitespaces
* Added polyline check to rendering sprite thinglist

Author: ioan-chera

source/p_map.cpp

@@ -771,7 +771,7 @@ bool P_CheckLineBlocksThing(line_t *ld, const linkoffset_t *link, PODCollection<
     {
         clip.blockline = ld;
         bool result    = clip.unstuck && !untouched(ld, link) &&
-                      FixedMul(clip.x - clip.thing->x, ld->dy) > FixedMul(clip.y - clip.thing->y, ld->dx);
+                         FixedMul(clip.x - clip.thing->x, ld->dy) > FixedMul(clip.y - clip.thing->y, ld->dx);
         if(!result && pushhit && ld->special && full_demo_version >= make_full_version(401, 0))
         {
             pushhit->add(ld);
@@ -2030,8 +2030,8 @@ bool P_TryMove(Mobj *thing, fixed_t x, fixed_t y, int dropoff)
                 int oldside;
                 if((oldside = P_PointOnLineSide(ox, oy, line)) != P_PointOnLineSide(tx, ty, line))
                 {
-                    if(!P_LevelIsVanillaHexen() && line->intflags & MLI_DYNASEGLINE && line->flags & ML_TWOSIDED &&
-                       line->backsector)
+                    if(demo_version >= 406 && !P_LevelIsVanillaHexen() && line->intflags & MLI_DYNASEGLINE &&
+                       line->flags & ML_TWOSIDED && line->backsector)
                     {
                         Thinker::AddMobileCrossLine(line, oldside, thing);
                     }
@@ -3056,17 +3056,24 @@ enum class SecnodeType
 //
 // killough 11/98: reformatted
 //
-static msecnode_t *P_AddSecnode(sector_t *s, msecnode_t *sector_t::*which_thinglist, Mobj *thing, msecnode_t *nextnode, SecnodeType type)
+static msecnode_t *P_AddSecnode(sector_t *s, msecnode_t *sector_t::*which_thinglist, Mobj *thing, msecnode_t *nextnode,
+                                SecnodeType type)
 {
     msecnode_t *node;
 
+    bool foundNormalNode = false;
     for(node = nextnode; node; node = node->m_tnext)
     {
         if(node->m_sector == s) // Already have a node for this sector?
         {
+            if(node->m_thing == thing && !(node->flags & MSN_POLYLINE))
+                foundNormalNode = true;
             node->m_thing = thing; // Yes. Setting m_thing says 'keep it'.
+
             if(type == SecnodeType::normal)
                 node->flags &= ~MSN_POLYLINE;
+            else if(type == SecnodeType::polyline && !foundNormalNode)
+                node->flags |= MSN_POLYLINE;
             return nextnode;
         }
     }
@@ -3196,7 +3203,7 @@ static bool PIT_GetSectors(line_t *ld, polyobj_t *po, void *vcontext)
     bbox[BOXTOP]             = pClip->bbox[BOXTOP] + link->y;
     bbox[BOXBOTTOM]          = pClip->bbox[BOXBOTTOM] + link->y;
 
-    const bool polyline = Polyobj_IsLine(*ld);
+    const bool        polyline = Polyobj_IsLine(*ld);
     const SecnodeType type =
         polyline && !(ld->intflags & MLI_1SPORTALLINE) ? SecnodeType::polyline : SecnodeType::normal;
 
@@ -3263,7 +3270,8 @@ static bool PIT_GetSectors(line_t *ld, polyobj_t *po, void *vcontext)
         }
         else
             frontsector = ld->frontsector;
-        pClip->sector_list = P_AddSecnode(frontsector, context->which_thinglist, pClip->thing, pClip->sector_list, type);
+        pClip->sector_list =
+            P_AddSecnode(frontsector, context->which_thinglist, pClip->thing, pClip->sector_list, type);
 
         if(ld->pflags & PS_PASSABLE && context->master)
         {

source/polyobj.cpp

@@ -1351,8 +1351,9 @@ static bool PolyobjIT_collectControlThings(int x, int y, int groupid, void *data
             }
             if(line->special && !(mo->flags & MF_TELEPORT))
             {
-                context->linesToCross.add(
-                    LineRelation{ .line = *line, .mobj{ mo }, .side = P_PointOnLineSidePrecise(mo->x, mo->y, line) });
+                const linkoffset_t *link = P_GetLinkOffset(mo->groupid, line->frontsector->groupid);
+                context->linesToCross.add(LineRelation{
+                    .line = *line, .mobj{ mo }, .side = P_PointOnLineSide(mo->x + link->x, mo->y + link->y, line) });
             }
         }
     }
@@ -1403,8 +1404,11 @@ static void Polyobj_makeThingsCrossLinesAfterMovement(const ControlThings &contr
 
     for(const LineRelation &relation : controlThings.linesToCross)
     {
-        if(relation.side != P_PointOnLineSidePrecise(relation.mobj->x, relation.mobj->y, &relation.line))
+        const linkoffset_t *link = P_GetLinkOffset(relation.mobj->groupid, relation.line.frontsector->groupid);
+        if(relation.side != P_PointOnLineSide(relation.mobj->x + link->x, relation.mobj->y + link->y, &relation.line))
+        {
             Thinker::AddMobileCrossLine(&relation.line, relation.side, relation.mobj.get());
+        }
     }
 }
 

source/r_defs.h

@@ -579,7 +579,7 @@ struct msecnode_t
     msecnode_t *m_tnext;  // next msecnode_t for this thing
     msecnode_t *m_sprev;  // prev msecnode_t for this sector
     msecnode_t *m_snext;  // next msecnode_t for this sector
-    unsigned    flags;  
+    unsigned    flags;
 };
 
 //

source/r_things.cpp

@@ -1596,6 +1596,8 @@ void R_AddSprites(cmapcontext_t &cmapcontext, spritecontext_t &spritecontext, Zo
         for(const msecnode_t *sectorNode = sec->touching_thinglist_by_sprites; sectorNode;
             sectorNode                   = sectorNode->m_snext)
         {
+            if(sectorNode->flags & MSN_POLYLINE)
+                continue;
             const Mobj *const thing = sectorNode->m_thing;
 
             if(R_checkAndMarkSprite(spritecontext, heap, thing))