From 14df9c01fafe901761045f58deecbbfff12b698c Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 15 Oct 2026 16:25:26 +0200 Subject: [PATCH] send over less mobj stuff in savegame on mobjscaled maps in some cases for phobos build none of this ever accounted for mapobjectscale sadly not vanilla compatible but oh well from https://gitlab.com/kart-krew-dev/ring-racers/-/commit/c4cca8c8b703b4bb23e27be4c3bfd37b9d092215 --- src/p_saveg.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/p_saveg.c b/src/p_saveg.c index 166de7010..77720934a 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1138,9 +1138,17 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0) #endif diff |= MD_MOM; +#ifdef PHOBOS_BUILD + if (mobj->radius != FixedMul(mapobjectscale, mobj->info->radius)) +#else if (mobj->radius != mobj->info->radius) +#endif diff |= MD_RADIUS; +#ifdef PHOBOS_BUILD + if (mobj->height != FixedMul(mapobjectscale, mobj->info->height)) +#else if (mobj->height != mobj->info->height) +#endif diff |= MD_HEIGHT; if (mobj->flags != mobj->info->flags) diff |= MD_FLAGS; @@ -1183,11 +1191,19 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 diff |= MD_MOVEFACTOR; if (mobj->fuse) diff |= MD_FUSE; +#ifdef PHOBOS_BUILD + if (mobj->watertop != INT32_MAX) +#else if (mobj->watertop) +#endif diff |= MD_WATERTOP; if (mobj->waterbottom) diff |= MD_WATERBOTTOM; +#ifdef PHOBOS_BUILD + if (mobj->scale != mapobjectscale) +#else if (mobj->scale != FRACUNIT) +#endif diff |= MD_SCALE; if (mobj->destscale != mobj->scale) diff |= MD_DSCALE; @@ -2094,11 +2110,19 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) if (diff & MD_RADIUS) mobj->radius = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->radius = FixedMul(mobj->info->radius, mapobjectscale); +#else mobj->radius = mobj->info->radius; +#endif if (diff & MD_HEIGHT) mobj->height = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->height = FixedMul(mobj->info->height, mapobjectscale); +#else mobj->height = mobj->info->height; +#endif if (diff & MD_FLAGS) mobj->flags = READUINT32(save->p); else @@ -2170,12 +2194,20 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) mobj->fuse = READINT32(save->p); if (diff & MD_WATERTOP) mobj->watertop = READFIXED(save->p); +#ifdef PHOBOS_BUILD + else + mobj->watertop = INT32_MAX; +#endif if (diff & MD_WATERBOTTOM) mobj->waterbottom = READFIXED(save->p); if (diff & MD_SCALE) mobj->scale = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->scale = mapobjectscale; +#else mobj->scale = FRACUNIT; +#endif if (diff & MD_DSCALE) mobj->destscale = READFIXED(save->p); else