diff --git a/src/p_saveg.c b/src/p_saveg.c index 992f0c944..cb5734563 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1382,7 +1382,6 @@ static void SaveGlowThinker(const thinker_t *th, const UINT8 type) WRITEINT32(save_p, ht->direction); WRITEINT32(save_p, ht->speed); } - // // SaveFireflickerThinker // @@ -1398,7 +1397,6 @@ static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type) WRITEINT32(save_p, ht->maxlight); WRITEINT32(save_p, ht->minlight); } - // // SaveElevatorThinker // @@ -1977,6 +1975,27 @@ 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->stretchslam = 0; + mobj->slamsoundtimer = 0; + + mobj->mirrored = 0; + mobj->z = z; mobj->floorz = floorz; mobj->ceilingz = ceilingz; @@ -2141,31 +2160,6 @@ 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->stretchslam = 0; - - // Timer for slam sound effect - mobj->slamsoundtimer = 0; - // - if (diff & MD_REDFLAG) { redflag = mobj;