diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 12:44:13 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:11 +0000 |
| commit | 6a31a440bb62eb7d6aff7d0a8133c7dd59cfc96c (patch) | |
| tree | 39103cd79ebf257885f107d65ca3a73153fc7f51 | |
| parent | 688433dd1ae613114076075a846273350deeaee6 (diff) | |
* Remove some redundant code introduced at some point during the merge
| -rw-r--r-- | src/game/g_combat.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 08bde632..0e05da98 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -763,9 +763,6 @@ static float G_CalcDamageModifier( vec3_t point, gentity_t *targ, gentity_t *att VectorSubtract( targOrigin, point, bulletPath ); vectoangles( bulletPath, bulletAngle ); - if( hitRotation < 0.0f ) - hitRotation += 360.0f; - hitRotation = AngleNormalize360( targ->client->ps.viewangles[ YAW ] - bulletAngle[ YAW ] ); @@ -773,6 +770,7 @@ static float G_CalcDamageModifier( vec3_t point, gentity_t *targ, gentity_t *att modifier = GetPointDamageModifier( targ, g_damageRegions[ class ], g_numDamageRegions[ class ], hitRotation, hitRatio ); + for( i = UP_NONE + 1; i < UP_NUM_UPGRADES; i++ ) { if( BG_InventoryContainsUpgrade( i, targ->client->ps.stats ) ) |