From c37b8b8f5246de506127bb7f1823d9dc78cd29bc Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Tue, 6 Jun 2023 02:39:58 -0500 Subject: [PATCH] Restore machinegun in non-race gametypes The change to have gauntlet in race had no effect as gauntlet is removed a few lines below. See commit b9c6fc91afc0b41a4935bfdb3652a45c0ca61171. --- engine/code/game/g_client.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/code/game/g_client.c b/engine/code/game/g_client.c index 0191f677..7e22a00a 100644 --- a/engine/code/game/g_client.c +++ b/engine/code/game/g_client.c @@ -1511,9 +1511,8 @@ void ClientSpawn(gentity_t *ent) { client->ps.clientNum = index; // dont give machinegun on spawn in races -// if (!isRallyRace()/* TEMP DERBY && g_gametype.integer != GT_DERBY */){ - if ( g_gametype.integer == GT_RACING || g_gametype.integer == GT_TEAM_RACING ) { - client->ps.stats[STAT_WEAPONS] = ( 1 << WP_GAUNTLET ); + if (!isRallyRace()/* TEMP DERBY && g_gametype.integer != GT_DERBY */){ + client->ps.stats[STAT_WEAPONS] = ( 1 << WP_MACHINEGUN ); if ( g_gametype.integer == GT_TEAM ) { client->ps.ammo[WP_MACHINEGUN] = 50;