rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-24 12:42:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing bug 4120 (HC shot counting as two)

Browse source
This commit is contained in:
Richard Allen 2011-03-13 03:26:23 +00:00
parent 9ac130084a
commit 84a3935a05
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reaction/code/game/g_weapon.c
View file

@ -764,14 +764,17 @@ void ShotgunPattern(vec3_t origin, vec3_t origin2, int seed, gentity_t * ent, in
count = DEFAULT_M3_COUNT; count = DEFAULT_M3_COUNT;
} else if (shotType == WP_HANDCANNON) { } else if (shotType == WP_HANDCANNON) {
// Elder: Statistics tracking // Elder: Statistics tracking
if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY) // JBravo: moving counting elsewhere to not count each HC shot twice as this gets called once
ent->client->pers.records[REC_HANDCANNONSHOTS]++; // for each barrel of the HC
// if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY)
// ent->client->pers.records[REC_HANDCANNONSHOTS]++;
count = DEFAULT_HANDCANNON_COUNT; count = DEFAULT_HANDCANNON_COUNT;
hc_multipler = 4; hc_multipler = 4;
} else { } else {
// Elder: Statistics tracking // Elder: Statistics tracking
if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY) // JBravo: moving counting elsewhere to not count each HC shot twice as this gets called once
ent->client->pers.records[REC_HANDCANNONSHOTS]++; // if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY)
// ent->client->pers.records[REC_HANDCANNONSHOTS]++;
count = DEFAULT_HANDCANNON_COUNT; count = DEFAULT_HANDCANNON_COUNT;
hc_multipler = 5; hc_multipler = 5;
} }
@ -1552,8 +1555,12 @@ void Weapon_HandCannon_Fire(gentity_t * ent)
tent2->s.angles2[1] += 5; tent2->s.angles2[1] += 5;
//Elder: note negative one //Elder: note negative one
//JBravo: Yes, why is that ? removing... //JBravo: Yes, why is that ? removing...
// ShotgunPattern(tent2->s.pos.trBase, tent2->s.origin2, tent2->s.eventParm, ent, -1); //JBravo: thats because the second barrel has a higher vspread. reverting back to -1
ShotgunPattern(tent2->s.pos.trBase, tent2->s.origin2, tent2->s.eventParm, ent, WP_HANDCANNON); ShotgunPattern(tent2->s.pos.trBase, tent2->s.origin2, tent2->s.eventParm, ent, -1);
// ShotgunPattern(tent2->s.pos.trBase, tent2->s.origin2, tent2->s.eventParm, ent, WP_HANDCANNON);
// JBravo: count the HC blasts here
if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY)
ent->client->pers.records[REC_HANDCANNONSHOTS]++;
//Elder: added for damage report //Elder: added for damage report
RQ3_ProduceShotgunDamageReport(ent); RQ3_ProduceShotgunDamageReport(ent);