diff options
Diffstat (limited to 'src/game/g_combat.c')
| -rw-r--r-- | src/game/g_combat.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 337ebf1..c79f97d 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1433,14 +1433,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, targ->credits[ attacker->client->ps.clientNum ] += take; } - // special cases... - if( mod == MOD_LEVEL2_CLAW && damage_orig == LEVEL2_CLAW_UPG_DMG ) - G_CombatStats_Hit( attacker, targ, CSW_LEVEL2_UPG, take ); - else if( ( mod == MOD_LCANNON || mod == MOD_LCANNON_SPLASH ) && - inflictor->s.generic1 == WPM_SECONDARY ) - G_CombatStats_Hit( attacker, targ, CSW_LCANNON_ALT, take ); - else - G_CombatStats_HitMOD( attacker, targ, mod, take ); + G_CombatStats_HitMOD( attacker, targ, mod, take ); if( targ->health <= 0 ) { @@ -1790,7 +1783,14 @@ const static combatStatsWeapon_t modToCsw[ ] = const static char *cswStrings[ ] = { -#define CSW(a,b,c) #a +#define CSW(a,b,c,d) #a +#include "g_csw.h" +#undef CSW +}; + +const static int cswToMod[ ] = +{ +#define CSW(a,b,c,d) b #include "g_csw.h" #undef CSW }; @@ -1989,14 +1989,14 @@ void G_LogCombatSettings( void ) char buffer[ 4096 ], *p = buffer; static const int cswDamages[ ] = { -#define CSW(a,b,c) (c) +#define CSW(a,b,c,d) (d) #include "g_csw.h" #undef CSW }; for( i = 0; i < CSW_MAX; i++ ) { - Com_sprintf( p, 4096 - ( p - buffer ), " %s %i", cswStrings[ i ], cswDamages[ i ] ); + Com_sprintf( p, 4096 - ( p - buffer ), " %s %i", modNames[ cswToMod[ i ] ], cswDamages[ i ] ); while( *p ) p++; } @@ -2026,7 +2026,7 @@ void G_LogCombatStats( gentity_t *ent ) Com_sprintf( p, 4096 - ( p - buffer ), " %s %i,%i,%i,%i,%i,%i", - cswStrings[ i ], + modNames[ cswToMod[ i ] ], cs->fired, cs->dealt[ CSD_ENEMY ], cs->dealt[ CSD_FRIENDLY ], |