diff options
Diffstat (limited to 'src/game/g_trigger.c')
| -rw-r--r-- | src/game/g_trigger.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/g_trigger.c b/src/game/g_trigger.c index fbcf4c4f..aff816dc 100644 --- a/src/game/g_trigger.c +++ b/src/game/g_trigger.c @@ -1111,9 +1111,9 @@ void trigger_ammo_touch( gentity_t *self, gentity_t *other, trace_t *trace ) else self->timestamp = level.time + FRAMETIME; - BG_FindAmmoForWeapon( other->client->ps.weapon, &maxAmmo, NULL, NULL ); + BG_FindAmmoForWeapon( other->client->ps.weapon, &maxAmmo, &maxClips ); BG_UnpackAmmoArray( other->client->ps.weapon, other->client->ps.ammo, other->client->ps.powerups, - &ammo, &clips, &maxClips ); + &ammo, &clips ); if( ( ammo + self->damage ) > maxAmmo ) { @@ -1129,7 +1129,7 @@ void trigger_ammo_touch( gentity_t *self, gentity_t *other, trace_t *trace ) ammo += self->damage; BG_PackAmmoArray( other->client->ps.weapon, other->client->ps.ammo, other->client->ps.powerups, - ammo, clips, maxClips ); + ammo, clips ); } /* |