From c46629e7e973d355c5eaba1385de1057eaedbe18 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 12 Sep 2025 18:06:10 +0200 Subject: [PATCH] fix taglist stuff on gamestate resend got kinda lost here lulul fixed diamond square elevator --- src/p_saveg.c | 13 +++++++------ src/p_spec.c | 2 +- src/p_spec.h | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/p_saveg.c b/src/p_saveg.c index 47d5a682e..d3714c9b0 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -3530,15 +3530,12 @@ static void P_ReloadSaveLevelData(void) ss->floorpic_angle = spawnss->floorpic_angle; ss->ceilingpic_angle = spawnss->ceilingpic_angle; ss->tag = spawnss->tag; - ss->nexttag = spawnss->nexttag; - ss->firsttag = spawnss->firsttag; - - //ss->flags = spawnss->flags; - //ss->gravity = spawnss->gravity; + ss->firsttag = ss->nexttag = -1; if (ss->ffloors) { ffloor_t *rover; + for (rover = ss->ffloors; rover; rover = rover->next) { rover->flags = rover->spawnflags; @@ -3554,10 +3551,12 @@ static void P_ReloadSaveLevelData(void) for (i = 0; i < numlines; i++, spawnli++, li++) { - //li->flags = spawnli->flags; li->special = spawnli->special; li->callcount = 0; + li->tag = spawnli->tag; + li->firsttag = li->nexttag = -1; + if (li->sidenum[0] != 0xffff) { si = &sides[li->sidenum[0]]; @@ -3580,6 +3579,8 @@ static void P_ReloadSaveLevelData(void) si->midtexture = spawnsi->midtexture; } } + + P_InitTagLists(); } FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading) diff --git a/src/p_spec.c b/src/p_spec.c index 30588c922..cf00520af 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -1233,7 +1233,7 @@ void P_ChangeSectorTag(UINT32 sector, INT16 newtag) * \sa P_FindSectorFromTag, P_ChangeSectorTag * \author Lee Killough */ -static inline void P_InitTagLists(void) +void P_InitTagLists(void) { register size_t i; diff --git a/src/p_spec.h b/src/p_spec.h index 60b10a8f4..7b763c498 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -80,6 +80,7 @@ void P_SwitchWeather(INT32 weathernum); boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller); void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller); void P_ChangeSectorTag(UINT32 sector, INT16 newtag); +void P_InitTagLists(void); // // P_LIGHTS