From 6e65d96647fcfcb99026d92ce336e63666f85d12 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sat, 13 Dec 2025 19:54:24 -0500 Subject: [PATCH] Revert "Fix aridtoad and other stuff" This reverts commit 27c0051a464462757e173a9ec1a82f94c10a8ac5. --- src/d_main.cpp | 2 +- src/info/mobjs.h | 2 +- src/p_mobj.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index a0170244a..6d9c1ce29 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -93,7 +93,7 @@ #define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291 #define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b #define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9 -#define ASSET_HASH_MAIN_PK3 0x7ec4ed423cb2b250 +#define ASSET_HASH_MAIN_PK3 0xb359aca95ab7d254 #define ASSET_HASH_MAPPATCH_PK3 0x73e09e7e291c7cc7 #define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461 #ifdef USE_PATCH_FILE diff --git a/src/info/mobjs.h b/src/info/mobjs.h index 57b43bc14..a45912f63 100644 --- a/src/info/mobjs.h +++ b/src/info/mobjs.h @@ -819,6 +819,7 @@ _(MERRYAMBIENCE) _(TWINKLECARTAMBIENCE) _(EXPLODINGBARREL) _(MERRYHORSE) +_(ARIDTOAD) _(BLUEFRUIT) _(ORANGEFRUIT) _(REDFRUIT) @@ -829,7 +830,6 @@ _(ADVENTURESPIKEC) _(BOOSTPROMPT) _(BOOSTOFF) _(BOOSTON) -_(ARIDTOAD) _(LIZARDMAN) _(LIONMAN) diff --git a/src/p_mobj.c b/src/p_mobj.c index ed2c29bca..9561f6ea8 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10983,6 +10983,8 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_REDFRUIT: case MT_PINKFRUIT: case MT_RANDOMAUDIENCE: + case MT_DOOD_BOX: + case MT_DOOD_BALLOON: case MT_BLUECRAWLA: case MT_REDCRAWLA: case MT_GFZFISH: // Greenflower Fish @@ -11073,8 +11075,6 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_THROWNEXPLOSION: case MT_THROWNGRENADE: case MT_EMBLEM: - case MT_DOOD_BOX: - case MT_DOOD_BALLOON: thing->shadowscale = FRACUNIT/3; break; case MT_SNEAKERPANEL: