rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-23 20:52:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bug fixed: when you had the bandolier, 2 or 3 clips for the pistol and already had akimbo, if you picked up another pistol, no ammo extra clips would be given for the pistol.

Browse source
This commit is contained in:
Andrei Drexler 2011-03-11 07:34:54 +00:00
parent 2b35f9ec2c
commit 6f95cebb11
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/code/game/g_items.c
View file

@ -330,14 +330,14 @@ int Pickup_Weapon(gentity_t * ent, gentity_t * other, int bandolierFactor)
//Elder: special case //Elder: special case
//Someone can optimize this code later, but for now, it works. //Someone can optimize this code later, but for now, it works.
if (!(other->client->ps.stats[STAT_WEAPONS] & (1 << WP_AKIMBO))) { if (!(other->client->ps.stats[STAT_WEAPONS] & (1 << WP_AKIMBO))) {
trap_SendServerCommand(other - g_entities, va("print \"[skipnotify]Picked up " RQ3_AKIMBO_NAME "^7\n\"")); trap_SendServerCommand(other - g_entities, va("print \"[skipnotify]Picked up " RQ3_PISTOL_NAME "^7\n\""));
other->client->ps.stats[STAT_WEAPONS] |= (1 << WP_AKIMBO); other->client->ps.stats[STAT_WEAPONS] |= (1 << WP_AKIMBO);
other->client->ps.ammo[WP_AKIMBO] = other->client->ps.ammo[WP_PISTOL] + RQ3_PISTOL_AMMO; other->client->ps.ammo[WP_AKIMBO] = other->client->ps.ammo[WP_PISTOL] + RQ3_PISTOL_AMMO;
//Elder: always reset back to full clip like Action if first pistol picked up //Elder: always reset back to full clip like Action if first pistol picked up
ammotoadd = RQ3_PISTOL_AMMO; ammotoadd = RQ3_PISTOL_AMMO;
} }
//Elder: Already have akimbo - technically should have pistol //Elder: Already have akimbo - technically should have pistol
else if (other->client->numClips[WP_PISTOL] < 2) { else if (other->client->numClips[WP_PISTOL] < 2 * bandolierFactor) {
//give an extra clip - make < 2 + 2 * hasBandolier(0/1) or something for bando when it's in //give an extra clip - make < 2 + 2 * hasBandolier(0/1) or something for bando when it's in
trap_SendServerCommand(other - g_entities, va("print \"[skipnotify]Picked up an extra clip^7\n\"")); trap_SendServerCommand(other - g_entities, va("print \"[skipnotify]Picked up an extra clip^7\n\""));
other->client->numClips[WP_PISTOL]++; other->client->numClips[WP_PISTOL]++;