From 21a4e7ae43515c3fd172e15b58deb71740566c64 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 5 Oct 2023 22:57:39 +0100 Subject: [PATCH] Remove last vestiges of Emerald Hunt behaviour from vanilla SRB2 Was in places the author of this commit needed to look --- src/doomstat.h | 2 -- src/g_game.c | 5 ----- src/p_setup.c | 3 --- 3 files changed, 10 deletions(-) diff --git a/src/doomstat.h b/src/doomstat.h index 3dd1eb1a4..fd5527266 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -763,8 +763,6 @@ extern UINT8 useSeal; extern UINT8 use1upSound; extern UINT8 maxXtraLife; // Max extra lives from rings -extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations - struct exitcondition_t { boolean losing; diff --git a/src/g_game.c b/src/g_game.c index a26f8a377..7a1962946 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -270,11 +270,6 @@ UINT8 introtoplay; UINT8 creditscutscene; UINT8 useSeal = 1; -// Emerald locations -mobj_t *hunt1; -mobj_t *hunt2; -mobj_t *hunt3; - tic_t racecountdown, exitcountdown, musiccountdown; // for racing exitcondition_t g_exit; diff --git a/src/p_setup.c b/src/p_setup.c index 0dc168034..94d5e84d7 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -7548,9 +7548,6 @@ static void P_InitLevelSettings(void) nummapspraycans = 0; - // emerald hunt - hunt1 = hunt2 = hunt3 = NULL; - // circuit, race and competition stuff numcheatchecks = 0; timeinmap = 0;