diff --git a/src/d_main.c b/src/d_main.c index 3df9d455f..dfacb1606 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -970,7 +970,6 @@ void D_ClearState(void) SplitScreen_OnChange(); cht_debug = 0; - emeralds = 0; memset(&luabanks, 0, sizeof(luabanks)); // In case someone exits out at the same time they start a time attack run, diff --git a/src/d_netcmd.c b/src/d_netcmd.c index f391e83c1..d67f09325 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -6254,7 +6254,6 @@ void Command_ExitGame_f(void) SplitScreen_OnChange(); cht_debug = 0; - emeralds = 0; memset(&luabanks, 0, sizeof(luabanks)); if (dirmenu) diff --git a/src/doomstat.h b/src/doomstat.h index 00b8c9cf7..2fc4a3878 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -691,8 +691,6 @@ typedef enum EMERALD_ALL = EMERALD_ALLCHAOS|EMERALD_ALLSUPER } emeraldflags_t; -extern UINT16 emeralds; - #define ALLCHAOSEMERALDS(v) ((v & EMERALD_ALLCHAOS) == EMERALD_ALLCHAOS) #define ALLSUPEREMERALDS(v) ((v & EMERALD_ALLSUPER) == EMERALD_ALLSUPER) #define ALLEMERALDS(v) ((v & EMERALD_ALL) == EMERALD_ALL) diff --git a/src/g_game.c b/src/g_game.c index 491a14f02..b2081eacd 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -140,8 +140,6 @@ boolean usedCheats = false; // Set when a "cheats on" is ever used. UINT8 paused; UINT8 modeattacking = ATTACKING_NONE; boolean imcontinuing = false; -boolean runemeraldmanager = false; -UINT16 emeraldspawndelay = 60*TICRATE; // menu demo things UINT8 numDemos = 0; @@ -205,7 +203,6 @@ static boolean retryingmodeattack = false; UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage. -UINT16 emeralds; INT32 luabanks[NUM_LUABANKS]; // Temporary holding place for nights data for the current map diff --git a/src/lua_script.c b/src/lua_script.c index 4da776e55..ee0a5f5ba 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -394,8 +394,6 @@ int LUA_WriteGlobals(lua_State *L, const char *word) skincolor_redring = (UINT16)luaL_checkinteger(L, 2); else if (fastcmp(word, "skincolor_bluering")) skincolor_bluering = (UINT16)luaL_checkinteger(L, 2); - else if (fastcmp(word, "emeralds")) - emeralds = (UINT16)luaL_checkinteger(L, 2); else if (fastcmp(word, "gravity")) gravity = (fixed_t)luaL_checkinteger(L, 2); else if (fastcmp(word, "stoppedclock")) diff --git a/src/m_cheat.c b/src/m_cheat.c index 1f81c370f..17e85e775 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -469,29 +469,6 @@ void Command_Savecheckpoint_f(void) } } -// Like M_GetAllEmeralds() but for console devmode junkies. -/* -void Command_Getallemeralds_f(void) -{ - REQUIRE_CHEATS; - REQUIRE_SINGLEPLAYER; - - emeralds = EMERALD_ALL; - - CONS_Printf(M_GetText("You now have all 7 emeralds.\n")); -} - -void Command_Resetemeralds_f(void) -{ - REQUIRE_CHEATS; - REQUIRE_SINGLEPLAYER; - - emeralds = 0; - - CONS_Printf(M_GetText("Emeralds reset to zero.\n")); -} -*/ - // // Devmode // diff --git a/src/menus/play-local-race-time-attack.c b/src/menus/play-local-race-time-attack.c index ed5990587..701ec94c4 100644 --- a/src/menus/play-local-race-time-attack.c +++ b/src/menus/play-local-race-time-attack.c @@ -485,7 +485,6 @@ void M_StartTimeAttack(INT32 choice) // Still need to reset devmode cht_debug = 0; - emeralds = 0; if (demo.playback) G_StopDemo(); diff --git a/src/p_mobj.h b/src/p_mobj.h index df453b0c2..a531c456d 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -566,8 +566,6 @@ extern INT32 modulothing; #define MAXHUNTEMERALDS 64 extern mapthing_t *huntemeralds[MAXHUNTEMERALDS]; extern INT32 numhuntemeralds; -extern boolean runemeraldmanager; -extern UINT16 emeraldspawndelay; extern INT32 numstarposts; extern UINT16 bossdisabled; extern boolean stoppedclock; diff --git a/src/p_saveg.c b/src/p_saveg.c index f80ffff7b..1e88332e4 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -5622,7 +5622,6 @@ static void P_NetArchiveMisc(savebuffer_t *save, boolean resending) WRITESINT8(save->p, g_pickedVote); - WRITEUINT16(save->p, emeralds); { UINT8 globools = 0; if (stagefailed) @@ -5796,7 +5795,6 @@ static boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading) g_pickedVote = READSINT8(save->p); - emeralds = READUINT16(save->p); { UINT8 globools = READUINT8(save->p); stagefailed = !!(globools & 1); diff --git a/src/p_setup.c b/src/p_setup.c index ee07ccf14..2abe1fef7 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7351,10 +7351,6 @@ static void P_InitLevelSettings(void) K_TimerReset(); - // special stage tokens, emeralds, and ring total - runemeraldmanager = false; - emeraldspawndelay = 60*TICRATE; - nummaprings = 0; nummapboxes = numgotboxes = 0; maptargets = numtargets = 0; diff --git a/src/p_user.c b/src/p_user.c index 938bf96e1..ed8c06116 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -342,7 +342,6 @@ void P_GiveEmerald(boolean spawnObj) UINT8 em = P_GetNextEmerald(); S_StartSound(NULL, sfx_cgot); // Got the emerald! - emeralds |= (1 << em); stagefailed = false; if (spawnObj)