From 8026fe0d4b4c0ead0fde3f9118a1856dec91f288 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 24 Jun 2019 16:21:03 -0400 Subject: [PATCH] Some few changes. The amount of rings you start with also applies when you respawn from a starpost. Startrings counts the ring total requirement for a perfect bonus. --- src/g_game.c | 4 ++-- src/p_setup.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 65d199350..632e33009 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2397,6 +2397,8 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost) P_SpawnPlayer(playernum); + players[playernum].rings = mapheaderinfo[gamemap-1]->startrings; + if (starpost) //Don't even bother with looking for a place to spawn. { P_MovePlayerToStarpost(playernum); @@ -2452,8 +2454,6 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost) } P_MovePlayerToSpawn(playernum, spawnpoint); - players[playernum].rings = mapheaderinfo[gamemap-1]->startrings; - #ifdef HAVE_BLUA LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :) #endif diff --git a/src/p_setup.c b/src/p_setup.c index 259cbfea3..585da2149 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2176,7 +2176,7 @@ static void P_LevelInitStuff(void) tokenbits = 0; runemeraldmanager = false; emeraldspawndelay = 60*TICRATE; - nummaprings = 0; + nummaprings = mapheaderinfo[gamemap-1]->startrings; // emerald hunt hunt1 = hunt2 = hunt3 = NULL;