From 18ccc3db272fd2414947e5f48003dee468672fda Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 3 Mar 2023 21:54:28 -0800 Subject: [PATCH] Remove g_hiscore since it's not used anymore --- src/doomstat.h | 1 - src/g_game.c | 1 - src/k_battle.c | 10 ---------- src/p_saveg.c | 4 ---- src/p_setup.c | 2 -- 5 files changed, 18 deletions(-) diff --git a/src/doomstat.h b/src/doomstat.h index 88e9bd66d..608fe98cd 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -697,7 +697,6 @@ extern UINT8 gamespeed; extern boolean franticitems; extern boolean encoremode, prevencoremode; -extern UINT32 g_hiscore; extern tic_t wantedcalcdelay; extern tic_t itemCooldowns[NUMKARTITEMS - 1]; extern tic_t mapreset; diff --git a/src/g_game.c b/src/g_game.c index a0d187790..70401a62c 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -298,7 +298,6 @@ SINT8 votes[MAXPLAYERS]; // Each player's vote SINT8 pickedvote; // What vote the host rolls // Server-sided, synched variables -UINT32 g_hiscore; // Highest score (points) achieved by anyone in game tic_t wantedcalcdelay; // Time before it recalculates WANTED tic_t itemCooldowns[NUMKARTITEMS - 1]; // Cooldowns to prevent item spawning tic_t mapreset; // Map reset delay when enough players have joined an empty game diff --git a/src/k_battle.c b/src/k_battle.c index 37bb33f4f..d2a2175dd 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -91,7 +91,6 @@ void K_CheckBumpers(void) { UINT8 i; UINT8 numingame = 0; - UINT32 toproundscore = 0; UINT8 nobumpers = 0; if (!(gametyperules & GTR_BUMPERS)) @@ -110,11 +109,6 @@ void K_CheckBumpers(void) numingame++; - if (players[i].roundscore > toproundscore) - { - toproundscore = players[i].roundscore; - } - if (players[i].bumpers <= 0) // if you don't have any bumpers, you're probably not a winner { nobumpers++; @@ -137,10 +131,6 @@ void K_CheckBumpers(void) } return; } - else - { - g_hiscore = toproundscore; - } if (numingame <= 1) { diff --git a/src/p_saveg.c b/src/p_saveg.c index fc9d7daf4..15c084200 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -4983,8 +4983,6 @@ static void P_NetArchiveMisc(savebuffer_t *save, boolean resending) WRITESINT8(save->p, speedscramble); WRITESINT8(save->p, encorescramble); - WRITEUINT32(save->p, g_hiscore); - // battleovertime_t WRITEUINT16(save->p, battleovertime.enabled); WRITEFIXED(save->p, battleovertime.radius); @@ -5154,8 +5152,6 @@ static inline boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading) speedscramble = READSINT8(save->p); encorescramble = READSINT8(save->p); - g_hiscore = READUINT32(save->p); - // battleovertime_t battleovertime.enabled = READUINT16(save->p); battleovertime.radius = READFIXED(save->p); diff --git a/src/p_setup.c b/src/p_setup.c index d97696309..4f3f4bc7f 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7109,8 +7109,6 @@ static void P_InitLevelSettings(void) franticitems = (boolean)cv_kartfrantic.value; } - g_hiscore = 0; - memset(&battleovertime, 0, sizeof(struct battleovertime)); speedscramble = encorescramble = -1;