rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shotgun fixes

This commit is contained in:
Bryce Hutchings 2002-06-29 21:57:18 +00:00
parent 486bfdfd43
commit 886581f3ca
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
reaction/cgame/cg_weapons.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.88 2002/06/29 21:57:18 niceass
// shotgun fixes
//
// Revision 1.87 2002/06/29 20:56:23 niceass // Revision 1.87 2002/06/29 20:56:23 niceass
// Change to the way HC/Shotty act // Change to the way HC/Shotty act
// //
@ -3453,20 +3456,21 @@ static void CG_ShotgunPellet(vec3_t start, vec3_t end, int skipNum, int shellWea
trace_t tr; trace_t tr;
int sourceContentType, destContentType; int sourceContentType, destContentType;
int l; int l, playerNum;
vec3_t t_start; vec3_t t_start;
//Makro //Makro
int Material; int Material;
VectorCopy( start, t_start ); VectorCopy( start, t_start );
playerNum = skipNum;
// NiceAss: Allow M3/HC shots to go through teammates // NiceAss: Allow M3/HC shots to go through teammates
for (l = 0; l < 10; l++) { for (l = 0; l < 10; l++) {
CG_Trace(&tr, t_start, NULL, NULL, end, skipNum, MASK_SHOT); CG_Trace(&tr, t_start, NULL, NULL, end, skipNum, MASK_SHOT);
if (tr.entityNum < MAX_CLIENTS && if (tr.entityNum < MAX_CLIENTS && cgs.gametype >= GT_TEAM &&
cgs.clientinfo[tr.entityNum].team == cg.snap->ps.persistant[PERS_SAVEDTEAM] ) { cgs.clientinfo[tr.entityNum].team == cgs.clientinfo[playerNum].team ) {
VectorCopy ( tr.endpos, t_start ); VectorCopy ( tr.endpos, t_start );
skipNum = tr.entityNum; skipNum = tr.entityNum;
continue; continue;