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

Think I finally have the mp5 damage right

Browse source
This commit is contained in:
Richard Allen 2002-10-04 20:52:39 +00:00
parent 244d6cd776
commit 44e5f982e9
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.128 2002/10/04 20:52:39 jbravo
// Think I finally have the mp5 damage right
//
// Revision 1.127 2002/09/29 16:06:44 jbravo // Revision 1.127 2002/09/29 16:06:44 jbravo
// Work done at the HPWorld expo // Work done at the HPWorld expo
// //
@ -2098,8 +2101,9 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
save = 0; save = 0;
// save some from armor // save some from armor
asave = CheckArmor(targ, take, dflags); // JBravo: armor ? dont think so.
take -= asave; // asave = CheckArmor(targ, take, dflags);
// take -= asave;
if (g_debugDamage.integer) { if (g_debugDamage.integer) {
G_Printf("%i: client:%i health:%i damage:%i armor:%i\n", level.time, targ->s.number, G_Printf("%i: client:%i health:%i damage:%i armor:%i\n", level.time, targ->s.number,
@ -2198,7 +2202,9 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
tent->s.eventParm = DirToByte(dir); tent->s.eventParm = DirToByte(dir);
tent->s.otherEntityNum = targ->s.clientNum; tent->s.otherEntityNum = targ->s.clientNum;
} }
take *= 1.8 + 1; //+ 1; // JBravo: order is important
take = (take * 1.8) + 1;
//take *= 1.8 + 1;
break; break;
case LOCATION_CHEST: case LOCATION_CHEST:
if (attacker->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY)) if (attacker->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) || g_gametype.integer != GT_TEAMPLAY))