Merge pull request #44 from zturtleman/no_mgun_derby

Don't spawn with machinegun in Demolition Derby
This commit is contained in:
insellium 2023-12-15 04:01:27 +05:00 committed by GitHub
commit 5b5c32d0e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1512,7 +1512,7 @@ void ClientSpawn(gentity_t *ent) {
client->ps.clientNum = index; client->ps.clientNum = index;
// dont give machinegun on spawn in races // dont give machinegun on spawn in races
if (!isRallyRace()/* TEMP DERBY && g_gametype.integer != GT_DERBY */){ if (!isRallyRace() && g_gametype.integer != GT_DERBY ){
client->ps.stats[STAT_WEAPONS] = ( 1 << WP_MACHINEGUN ); client->ps.stats[STAT_WEAPONS] = ( 1 << WP_MACHINEGUN );
if ( g_gametype.integer == GT_TEAM ) { if ( g_gametype.integer == GT_TEAM ) {
@ -1642,7 +1642,7 @@ void ClientSpawn(gentity_t *ent) {
G_KillBox(ent); G_KillBox(ent);
// force the base weapon up // force the base weapon up
// STONELANCE // STONELANCE
if (!isRallyRace()/* TEMP DERBY && g_gametype.integer != GT_DERBY*/){ if (!isRallyRace() && g_gametype.integer != GT_DERBY ){
client->ps.weapon = WP_MACHINEGUN; client->ps.weapon = WP_MACHINEGUN;
} }
else if (!isRallyNonDMRace()/*TEMP DERBY && g_gametype.integer != GT_DERBY*/){ else if (!isRallyNonDMRace()/*TEMP DERBY && g_gametype.integer != GT_DERBY*/){