From 2dc8bf321e108db57d8ceab9879b774f7abb9606 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 14 Feb 2024 17:40:17 +0100 Subject: [PATCH] do this again --- src/p_saveg.c | 60 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/src/p_saveg.c b/src/p_saveg.c index 82870e763..d99d27d70 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1382,6 +1382,7 @@ static void SaveGlowThinker(const thinker_t *th, const UINT8 type) WRITEINT32(save_p, ht->direction); WRITEINT32(save_p, ht->speed); } + // // SaveFireflickerThinker // @@ -1397,6 +1398,7 @@ static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type) WRITEINT32(save_p, ht->maxlight); WRITEINT32(save_p, ht->minlight); } + // // SaveElevatorThinker // @@ -1975,29 +1977,6 @@ static void LoadMobjThinker(actionf_p1 thinker) // declare this as a valid mobj as soon as possible. mobj->thinker.function.acp1 = thinker; - mobj->rollangle = 0; - - mobj->pitch = 0; - mobj->roll = 0; - - mobj->sloperoll = 0; - mobj->slopepitch = 0; - - mobj->pitch_sprite = 0; - mobj->roll_sprite = 0; - - mobj->spritexoffset = mobj->old_spritexoffset = 0; - mobj->spriteyoffset = mobj->old_spriteyoffset = 0; - mobj->spritexscale = mobj->old_spritexscale = FRACUNIT; - mobj->spriteyscale = mobj->old_spriteyscale = FRACUNIT; - mobj->realxscale = FRACUNIT; - mobj->realyscale = FRACUNIT; - - mobj->stretchslam = 0; - mobj->slamsoundtimer = 0; - - mobj->mirrored = 0; - mobj->z = z; mobj->floorz = floorz; mobj->ceilingz = ceilingz; @@ -2162,6 +2141,39 @@ static void LoadMobjThinker(actionf_p1 thinker) if (diff2 & MD2_COLORIZED) mobj->colorized = READUINT8(save_p); + //{ Saturn stuff, needs to be set, but shouldnt be synched + + // Sprite Rotation + mobj->rollangle = 0; + mobj->pitch = 0; + mobj->roll = 0; + mobj->sloperoll = 0; + mobj->slopepitch = 0; + mobj->pitch_sprite = 0; + mobj->roll_sprite = 0; + + // Horizontal flip + mobj->mirrored = 0; + + // Sprite Rendering stuff + mobj->spritexoffset = 0; + mobj->spriteyoffset = 0; + mobj->spritexscale = FRACUNIT; + mobj->spriteyscale = FRACUNIT; + mobj->realxscale = FRACUNIT; + mobj->realyscale = FRACUNIT; + mobj->stretchslam = 0; + + mobj->stretchslam = 0; + mobj->slamsoundtimer = 0; + + mobj->mirrored = 0; + + // Timer for slam sound effect + mobj->slamsoundtimer = 0; + + //} + if (diff & MD_REDFLAG) { redflag = mobj; @@ -2347,6 +2359,7 @@ static void LoadGlowThinker(actionf_p1 thinker) ht->sector->lightingdata = ht; P_AddThinker(&ht->thinker); } + // // LoadFireflickerThinker // @@ -2365,6 +2378,7 @@ static void LoadFireflickerThinker(actionf_p1 thinker) ht->sector->lightingdata = ht; P_AddThinker(&ht->thinker); } + // // LoadElevatorThinker //