diff options
| author | Jeff Kent <jeff@jkent.net> | 2017-04-13 11:30:00 +0000 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-04-15 17:20:41 +0200 |
| commit | 26e25997647bfcc8692a2209e5670d4c0119ea8c (patch) | |
| tree | be69b2f824a6b749e12849a8b6da32e6ca59d1a0 /src/game/g_trigger.c | |
| parent | b4c0348da140348f3cbb48cfe544c5682c9e5d34 (diff) | |
multi-protocol: change the playerState_t and entityState_t structs to the versions in the latest code base
this includes changing how ammo and clips r stored
Diffstat (limited to 'src/game/g_trigger.c')
| -rw-r--r-- | src/game/g_trigger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/g_trigger.c b/src/game/g_trigger.c index 2b5b25a..0ac34bb 100644 --- a/src/game/g_trigger.c +++ b/src/game/g_trigger.c @@ -1099,8 +1099,8 @@ void trigger_ammo_touch( gentity_t *self, gentity_t *other, trace_t *trace ) self->timestamp = level.time + FRAMETIME; BG_FindAmmoForWeapon( other->client->ps.weapon, &maxAmmo, &maxClips ); - BG_UnpackAmmoArray( other->client->ps.weapon, other->client->ps.ammo, other->client->ps.powerups, - &ammo, &clips ); + ammo = other->client->ps.ammo; + clips = other->client->ps.clips; if( ( ammo + self->damage ) > maxAmmo ) { @@ -1115,8 +1115,8 @@ void trigger_ammo_touch( gentity_t *self, gentity_t *other, trace_t *trace ) else ammo += self->damage; - BG_PackAmmoArray( other->client->ps.weapon, other->client->ps.ammo, other->client->ps.powerups, - ammo, clips ); + other->client->ps.ammo = ammo; + other->client->ps.clips = clips; } /* |