From 5cd3953e31eefab901d9762d0f6465a1e94f40bf Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 6 Aug 2025 00:03:31 +0200 Subject: [PATCH] fix levelstuff not being interpolated on netgame join or resynch i love polyobjects --- src/p_polyobj.c | 2 +- src/p_polyobj.h | 1 + src/p_saveg.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-) diff --git a/src/p_polyobj.c b/src/p_polyobj.c index 7842cfad3..27463fbac 100644 --- a/src/p_polyobj.c +++ b/src/p_polyobj.c @@ -1511,7 +1511,7 @@ static polyobj_t *Polyobj_GetParent(polyobj_t *po) // Iteratively retrieves the children POs of a parent, // sorta like P_FindSectorSpecialFromTag. // -static polyobj_t *Polyobj_GetChild(polyobj_t *po, INT32 *start) +polyobj_t *Polyobj_GetChild(polyobj_t *po, INT32 *start) { for (; *start < numPolyObjects; (*start)++) { diff --git a/src/p_polyobj.h b/src/p_polyobj.h index 9a47cd150..92f46dd69 100644 --- a/src/p_polyobj.h +++ b/src/p_polyobj.h @@ -269,6 +269,7 @@ typedef struct polydisplacedata_s // polyobj_t *Polyobj_GetForNum(INT32 id); +polyobj_t *Polyobj_GetChild(polyobj_t *po, INT32 *start); void Polyobj_InitLevel(void); void Polyobj_MoveOnLoad(polyobj_t *po, angle_t angle, fixed_t x, fixed_t y); boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y); diff --git a/src/p_saveg.c b/src/p_saveg.c index 8dc50e1f6..624a3badf 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -2234,6 +2234,12 @@ static void LoadSpecialLevelThinker(savebuffer_t *save, actionf_p1 thinker, UINT } P_AddThinker(&ht->thinker); + + // interpolation + if (floorOrCeiling & 2) + R_CreateInterpolator_SectorPlane(&ht->thinker, ht->sector, true); + if (floorOrCeiling & 1) + R_CreateInterpolator_SectorPlane(&ht->thinker, ht->sector, false); } // @@ -2263,6 +2269,9 @@ static void LoadCeilingThinker(savebuffer_t *save, actionf_p1 thinker) if (ht->sector) ht->sector->ceilingdata = ht; P_AddThinker(&ht->thinker); + + // interpolation + R_CreateInterpolator_SectorPlane(&ht->thinker, ht->sector, true); } // @@ -2287,6 +2296,9 @@ static void LoadFloormoveThinker(savebuffer_t *save, actionf_p1 thinker) if (ht->sector) ht->sector->floordata = ht; P_AddThinker(&ht->thinker); + + // interpolation + R_CreateInterpolator_SectorPlane(&ht->thinker, ht->sector, false); } // @@ -2400,6 +2412,9 @@ static void LoadElevatorThinker(savebuffer_t *save, actionf_p1 thinker, UINT8 fl } P_AddThinker(&ht->thinker); + + // interpolation + R_CreateInterpolator_SectorPlane(&ht->thinker, ht->sector, (floorOrCeiling & 2)); } // @@ -2422,6 +2437,22 @@ static void LoadScrollThinker(savebuffer_t *save, actionf_p1 thinker) ht->exclusive = READINT32(save->p); ht->type = READUINT8(save->p); P_AddThinker(&ht->thinker); + + // interpolation + switch (ht->type) + { + case sc_side: + R_CreateInterpolator_SideScroll(&ht->thinker, &sides[ht->affectee]); + break; + case sc_floor: + R_CreateInterpolator_SectorScroll(&ht->thinker, §ors[ht->affectee], false); + break; + case sc_ceiling: + R_CreateInterpolator_SectorScroll(&ht->thinker, §ors[ht->affectee], true); + break; + default: + break; + } } // @@ -2553,6 +2584,17 @@ static inline void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker ht->distance = READINT32(save->p); ht->turnobjs = READUINT8(save->p); P_AddThinker(&ht->thinker); + + // interpolation + polyobj_t *po; + + if (!(po = Polyobj_GetForNum(ht->polyObjNum))) + { + CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", ht->polyObjNum); + return; + } + + R_CreateInterpolator_Polyobj(&ht->thinker, po); } // @@ -2571,6 +2613,17 @@ static void LoadPolymoveThinker(savebuffer_t *save, actionf_p1 thinker) ht->distance = READINT32(save->p); ht->angle = READANGLE(save->p); P_AddThinker(&ht->thinker); + + // interpolation + polyobj_t *po; + + if (!(po = Polyobj_GetForNum(ht->polyObjNum))) + { + CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", ht->polyObjNum); + return; + } + + R_CreateInterpolator_Polyobj(&ht->thinker, po); } // @@ -2595,6 +2648,36 @@ static inline void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinke ht->diffy = READFIXED(save->p); ht->diffz = READFIXED(save->p); P_AddThinker(&ht->thinker); + + // interpolation + polyobj_t *po; + polyobj_t *oldpo; + INT32 start; + + if (!(po = Polyobj_GetForNum(ht->polyObjNum))) + { + CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", ht->polyObjNum); + return; + } + + R_CreateInterpolator_Polyobj(&ht->thinker, po); + // T_PolyObjWaypoint is the only polyobject movement + // that can adjust z, so we add these ones too. + R_CreateInterpolator_SectorPlane(&ht->thinker, po->lines[0]->backsector, false); + R_CreateInterpolator_SectorPlane(&ht->thinker, po->lines[0]->backsector, true); + + // Most other polyobject functions handle children by recursively + // giving each child another thinker. T_PolyObjWaypoint handles + // it manually though, which means we need to manually give them + // interpolation here instead. + start = 0; + oldpo = po; + while ((po = Polyobj_GetChild(oldpo, &start))) + { + R_CreateInterpolator_Polyobj(&ht->thinker, po); + R_CreateInterpolator_SectorPlane(&ht->thinker, po->lines[0]->backsector, false); + R_CreateInterpolator_SectorPlane(&ht->thinker, po->lines[0]->backsector, true); + } } // @@ -2620,6 +2703,17 @@ static inline void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 think ht->momy = READFIXED(save->p); ht->closing = READUINT8(save->p); P_AddThinker(&ht->thinker); + + // interpolation + polyobj_t *po; + + if (!(po = Polyobj_GetForNum(ht->polyObjNum))) + { + CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", ht->polyObjNum); + return; + } + + R_CreateInterpolator_Polyobj(&ht->thinker, po); } // @@ -2640,6 +2734,17 @@ static inline void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 think ht->distance = READINT32(save->p); ht->closing = READUINT8(save->p); P_AddThinker(&ht->thinker); + + // interpolation + polyobj_t *po; + + if (!(po = Polyobj_GetForNum(ht->polyObjNum))) + { + CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", ht->polyObjNum); + return; + } + + R_CreateInterpolator_Polyobj(&ht->thinker, po); } // @@ -2657,6 +2762,17 @@ static inline void LoadPolydisplaceThinker(savebuffer_t *save, actionf_p1 thinke ht->dy = READFIXED(save->p); ht->oldHeights = READFIXED(save->p); P_AddThinker(&ht->thinker); + + // interpolation + polyobj_t *po; + + if (!(po = Polyobj_GetForNum(ht->polyObjNum))) + { + CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", ht->polyObjNum); + return; + } + + R_CreateInterpolator_Polyobj(&ht->thinker, po); } //