From 67f4505a060292fe9e7e4cfdd0b2a3e10ec4c7bb Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 20 Mar 2023 19:48:12 -0700 Subject: [PATCH] Revert "Add cv_scrambleremoved, disable scramble on P_RemoveMobj" This reverts commit a55ddef52813dc459eb9afa7370deab0273340c2. --- src/p_local.h | 7 ------- src/p_mobj.c | 10 ++++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/p_local.h b/src/p_local.h index 973af8621..eb4633ff4 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -66,10 +66,6 @@ extern "C" { #define P_GetPlayerViewHeight(player) (41*player->mo->height/48) -#ifdef PARANOIA -#define SCRAMBLE_REMOVED // Force debug build to crash when Removed mobj is accessed -#endif - typedef enum { THINK_POLYOBJ, @@ -288,9 +284,6 @@ extern mapthing_t *itemrespawnque[ITEMQUESIZE]; extern tic_t itemrespawntime[ITEMQUESIZE]; extern size_t iquehead, iquetail; extern consvar_t cv_gravity, cv_movebob; -#ifdef SCRAMBLE_REMOVED -extern consvar_t cv_scrambleremoved; -#endif void P_RespawnBattleBoxes(void); mobjtype_t P_GetMobjtype(UINT16 mthingtype); diff --git a/src/p_mobj.c b/src/p_mobj.c index 8e64ae584..384fd6ebb 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -53,8 +53,6 @@ static CV_PossibleValue_t CV_BobSpeed[] = {{0, "MIN"}, {4*FRACUNIT, "MAX"}, {0, NULL}}; consvar_t cv_movebob = CVAR_INIT ("movebob", "1.0", CV_FLOAT|CV_SAVE, CV_BobSpeed, NULL); -consvar_t cv_scrambleremoved = CVAR_INIT ("scrambleremoved", "On", CV_NETVAR, CV_OnOff, NULL); - actioncache_t actioncachehead; static mobj_t *overlaycap = NULL; @@ -11064,6 +11062,9 @@ mapthing_t *itemrespawnque[ITEMQUESIZE]; tic_t itemrespawntime[ITEMQUESIZE]; size_t iquehead, iquetail; +#ifdef PARANOIA +#define SCRAMBLE_REMOVED // Force debug build to crash when Removed mobj is accessed +#endif void P_RemoveMobj(mobj_t *mobj) { I_Assert(mobj != NULL); @@ -11204,10 +11205,7 @@ void P_RemoveMobj(mobj_t *mobj) // DBG: set everything in mobj_t to 0xFF instead of leaving it. debug memory error. #ifdef SCRAMBLE_REMOVED // Invalidate mobj_t data to cause crashes if accessed! - if (cv_scrambleremoved.value) - { - memset((UINT8 *)mobj + sizeof(thinker_t), 0xff, sizeof(mobj_t) - sizeof(thinker_t)); - } + memset((UINT8 *)mobj + sizeof(thinker_t), 0xff, sizeof(mobj_t) - sizeof(thinker_t)); #endif }