diff options
| author | Tim Angus <tim@ngus.net> | 2004-10-17 15:44:13 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-10-17 15:44:13 +0000 |
| commit | 2c67a10f6799fa7a062f30f6310391bf60c02d5f (patch) | |
| tree | f797cc67ac1bcb4780ff15b555ed652f7aa00119 /src/game/g_client.c | |
| parent | 7ccb349bbdaedd979fb67db17eef757915c8d74a (diff) | |
* Gave some of the shared functions more sensible names
Diffstat (limited to 'src/game/g_client.c')
| -rw-r--r-- | src/game/g_client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c index da2f3d25..441b2266 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -996,7 +996,7 @@ void ClientUserinfoChanged( int clientNum ) client->pers.maxHealth = 0; // set model - if( client->ps.stats[ STAT_PCLASS ] == PCL_H_BASE && BG_gotItem( UP_BATTLESUIT, client->ps.stats ) ) + if( client->ps.stats[ STAT_PCLASS ] == PCL_H_BASE && BG_InventoryContainsUpgrade( UP_BATTLESUIT, client->ps.stats ) ) { Com_sprintf( buffer, MAX_QPATH, "%s/%s", BG_FindModelNameForClass( PCL_H_BSUIT ), BG_FindSkinNameForClass( PCL_H_BSUIT ) ); @@ -1365,7 +1365,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles // clear entity values if( ent->client->pers.classSelection == PCL_H_BASE ) { - BG_packWeapon( WP_BLASTER, client->ps.stats ); + BG_AddWeaponToInventory( WP_BLASTER, client->ps.stats ); weapon = client->pers.humanItemSelection; } else if( client->sess.sessionTeam != TEAM_SPECTATOR ) @@ -1374,8 +1374,8 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles weapon = WP_NONE; BG_FindAmmoForWeapon( weapon, &ammo, &clips, &maxClips ); - BG_packWeapon( weapon, client->ps.stats ); - BG_packAmmoArray( weapon, client->ps.ammo, client->ps.powerups, ammo, clips, maxClips ); + BG_AddWeaponToInventory( weapon, client->ps.stats ); + BG_PackAmmoArray( weapon, client->ps.ammo, client->ps.powerups, ammo, clips, maxClips ); ent->client->ps.stats[ STAT_PCLASS ] = ent->client->pers.classSelection; ent->client->ps.stats[ STAT_PTEAM ] = ent->client->pers.teamSelection; @@ -1467,7 +1467,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles for( i = WP_NUM_WEAPONS - 1; i > 0 ; i-- ) { - if( BG_gotWeapon( i, client->ps.stats ) ) + if( BG_InventoryContainsWeapon( i, client->ps.stats ) ) { client->ps.weapon = i; break; |