thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove a bunch of unused emerald stuff inherited from SRB2

Browse source 
All superseded by M_CheckCupEmeralds + GTR_POWERSTONES stuff
This commit is contained in:
toaster 2023-06-23 23:16:09 +01:00
parent 060c03f011
commit 45f8f1c89f
11 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_main.c
View file

@ -970,7 +970,6 @@ void D_ClearState(void)
SplitScreen_OnChange(); SplitScreen_OnChange();
cht_debug = 0; cht_debug = 0;
emeralds = 0;
memset(&luabanks, 0, sizeof(luabanks)); memset(&luabanks, 0, sizeof(luabanks));
// In case someone exits out at the same time they start a time attack run, // In case someone exits out at the same time they start a time attack run,

1
src/d_netcmd.c
View file

@ -6254,7 +6254,6 @@ void Command_ExitGame_f(void)
SplitScreen_OnChange(); SplitScreen_OnChange();
cht_debug = 0; cht_debug = 0;
emeralds = 0;
memset(&luabanks, 0, sizeof(luabanks)); memset(&luabanks, 0, sizeof(luabanks));
if (dirmenu) if (dirmenu)

2
src/doomstat.h
View file

@ -691,8 +691,6 @@ typedef enum
EMERALD_ALL = EMERALD_ALLCHAOS|EMERALD_ALLSUPER EMERALD_ALL = EMERALD_ALLCHAOS|EMERALD_ALLSUPER
} emeraldflags_t; } emeraldflags_t;
extern UINT16 emeralds;
#define ALLCHAOSEMERALDS(v) ((v & EMERALD_ALLCHAOS) == EMERALD_ALLCHAOS) #define ALLCHAOSEMERALDS(v) ((v & EMERALD_ALLCHAOS) == EMERALD_ALLCHAOS)
#define ALLSUPEREMERALDS(v) ((v & EMERALD_ALLSUPER) == EMERALD_ALLSUPER) #define ALLSUPEREMERALDS(v) ((v & EMERALD_ALLSUPER) == EMERALD_ALLSUPER)
#define ALLEMERALDS(v) ((v & EMERALD_ALL) == EMERALD_ALL) #define ALLEMERALDS(v) ((v & EMERALD_ALL) == EMERALD_ALL)

3
src/g_game.c
View file

@ -140,8 +140,6 @@ boolean usedCheats = false; // Set when a "cheats on" is ever used.
UINT8 paused; UINT8 paused;
UINT8 modeattacking = ATTACKING_NONE; UINT8 modeattacking = ATTACKING_NONE;
boolean imcontinuing = false; boolean imcontinuing = false;
boolean runemeraldmanager = false;
UINT16 emeraldspawndelay = 60*TICRATE;
// menu demo things // menu demo things
UINT8 numDemos = 0; 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. UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage.
UINT16 emeralds;
INT32 luabanks[NUM_LUABANKS]; INT32 luabanks[NUM_LUABANKS];
// Temporary holding place for nights data for the current map // Temporary holding place for nights data for the current map

2
src/lua_script.c
View file

@ -394,8 +394,6 @@ int LUA_WriteGlobals(lua_State *L, const char *word)
skincolor_redring = (UINT16)luaL_checkinteger(L, 2); skincolor_redring = (UINT16)luaL_checkinteger(L, 2);
else if (fastcmp(word, "skincolor_bluering")) else if (fastcmp(word, "skincolor_bluering"))
skincolor_bluering = (UINT16)luaL_checkinteger(L, 2); skincolor_bluering = (UINT16)luaL_checkinteger(L, 2);
else if (fastcmp(word, "emeralds"))
emeralds = (UINT16)luaL_checkinteger(L, 2);
else if (fastcmp(word, "gravity")) else if (fastcmp(word, "gravity"))
gravity = (fixed_t)luaL_checkinteger(L, 2); gravity = (fixed_t)luaL_checkinteger(L, 2);
else if (fastcmp(word, "stoppedclock")) else if (fastcmp(word, "stoppedclock"))

23
src/m_cheat.c
View file

@ -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 // Devmode
// //

1
src/menus/play-local-race-time-attack.c
View file

@ -485,7 +485,6 @@ void M_StartTimeAttack(INT32 choice)
// Still need to reset devmode // Still need to reset devmode
cht_debug = 0; cht_debug = 0;
emeralds = 0;
if (demo.playback) if (demo.playback)
G_StopDemo(); G_StopDemo();

2
src/p_mobj.h
View file

@ -566,8 +566,6 @@ extern INT32 modulothing;
#define MAXHUNTEMERALDS 64 #define MAXHUNTEMERALDS 64
extern mapthing_t *huntemeralds[MAXHUNTEMERALDS]; extern mapthing_t *huntemeralds[MAXHUNTEMERALDS];
extern INT32 numhuntemeralds; extern INT32 numhuntemeralds;
extern boolean runemeraldmanager;
extern UINT16 emeraldspawndelay;
extern INT32 numstarposts; extern INT32 numstarposts;
extern UINT16 bossdisabled; extern UINT16 bossdisabled;
extern boolean stoppedclock; extern boolean stoppedclock;

2
src/p_saveg.c
View file

@ -5622,7 +5622,6 @@ static void P_NetArchiveMisc(savebuffer_t *save, boolean resending)
WRITESINT8(save->p, g_pickedVote); WRITESINT8(save->p, g_pickedVote);
WRITEUINT16(save->p, emeralds);
{ {
UINT8 globools = 0; UINT8 globools = 0;
if (stagefailed) if (stagefailed)
@ -5796,7 +5795,6 @@ static boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
g_pickedVote = READSINT8(save->p); g_pickedVote = READSINT8(save->p);
emeralds = READUINT16(save->p);
{ {
UINT8 globools = READUINT8(save->p); UINT8 globools = READUINT8(save->p);
stagefailed = !!(globools & 1); stagefailed = !!(globools & 1);

4
src/p_setup.c
View file

@ -7351,10 +7351,6 @@ static void P_InitLevelSettings(void)
K_TimerReset(); K_TimerReset();
// special stage tokens, emeralds, and ring total
runemeraldmanager = false;
emeraldspawndelay = 60*TICRATE;
nummaprings = 0; nummaprings = 0;
nummapboxes = numgotboxes = 0; nummapboxes = numgotboxes = 0;
maptargets = numtargets = 0; maptargets = numtargets = 0;

1
src/p_user.c
View file

@ -342,7 +342,6 @@ void P_GiveEmerald(boolean spawnObj)
UINT8 em = P_GetNextEmerald(); UINT8 em = P_GetNextEmerald();
S_StartSound(NULL, sfx_cgot); // Got the emerald! S_StartSound(NULL, sfx_cgot); // Got the emerald!
emeralds |= (1 << em);
stagefailed = false; stagefailed = false;
if (spawnObj) if (spawnObj)