diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 12:03:45 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:38 +0000 |
| commit | e86b506d79fc62a1fba206e070aae15929197aaa (patch) | |
| tree | 6fc0f01c9e0f4faec326bea43a6eaddf28ae85c4 /src/game/g_client.c | |
| parent | b323f7d847719130bc51281d18126c57c9ab7fc8 (diff) | |
* Merge STAT_WEAPONS[2] into STAT_WEAPON and dispose of unnecessary STAT_SLOTS
* Testing patch to fix ready mask
Diffstat (limited to 'src/game/g_client.c')
| -rw-r--r-- | src/game/g_client.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c index 6320df2f..1582a606 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -1437,9 +1437,6 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles // calculate each client's acceleration ent->evaluateAcceleration = qtrue; - client->ps.stats[ STAT_WEAPONS ] = 0; - client->ps.stats[ STAT_WEAPONS2 ] = 0; - client->ps.stats[ STAT_SLOTS ] = 0; client->ps.stats[ STAT_MISC ] = 0; client->ps.eFlags = flags; @@ -1456,7 +1453,6 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles // clear entity values if( ent->client->pers.classSelection == PCL_HUMAN ) { - BG_AddWeaponToInventory( WP_BLASTER, client->ps.stats ); BG_AddUpgradeToInventory( UP_MEDKIT, client->ps.stats ); weapon = client->pers.humanItemSelection; } @@ -1467,7 +1463,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles maxAmmo = BG_Weapon( weapon )->maxAmmo; maxClips = BG_Weapon( weapon )->maxClips; - BG_AddWeaponToInventory( weapon, client->ps.stats ); + client->ps.stats[ STAT_WEAPON ] = weapon; client->ps.ammo = maxAmmo; client->ps.clips = maxClips; |