summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/g_client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 51972395..ea4aab82 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1590,7 +1590,9 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
trap_LinkEntity( ent );
// force the base weapon up
- client->ps.weapon = WP_NONE;
+ if( client->pers.teamSelection == TEAM_HUMANS )
+ G_ForceWeaponChange( ent, weapon );
+
client->ps.weaponstate = WEAPON_READY;
}