summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-03 12:08:00 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:42 +0000
commitfe258dcdc974ab0a86d88bfb1bf503e0fa63f163 (patch)
tree84ca4620bde558c3e62f49c650228f40af29e76e /src/game/g_combat.c
parent03b74b80b30bce8bba06578dc44264ef6720462c (diff)
* Oops, forgot to fix the indenting on the previous commit
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index f8866871..5cb879f1 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -982,14 +982,14 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
if( g_dretchPunt.integer &&
targ->client->ps.stats[ STAT_CLASS ] == PCL_ALIEN_LEVEL0 )
{
- vec3_t dir, push;
+ vec3_t dir, push;
- VectorSubtract( targ->r.currentOrigin, attacker->r.currentOrigin, dir );
- VectorNormalizeFast( dir );
- VectorScale( dir, ( damage * 10.0f ), push );
- push[2] = 64.0f;
- VectorAdd( targ->client->ps.velocity, push, targ->client->ps.velocity );
- return;
+ VectorSubtract( targ->r.currentOrigin, attacker->r.currentOrigin, dir );
+ VectorNormalizeFast( dir );
+ VectorScale( dir, ( damage * 10.0f ), push );
+ push[2] = 64.0f;
+ VectorAdd( targ->client->ps.velocity, push, targ->client->ps.velocity );
+ return;
}
// don't do friendly fire on movement attacks
else if( mod == MOD_LEVEL4_TRAMPLE || mod == MOD_LEVEL3_POUNCE ||