diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:27:09 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:00 +0000 |
| commit | e5d4b2471e72ff574ebc0d01afbab50fc447cf5a (patch) | |
| tree | 852b809c6d12be200fb9d7fac8baf8132c140dfa /src/game/g_combat.c | |
| parent | 0cf04fe37fef2e827a95bb19926a3cbf8e98c581 (diff) | |
* Gave Painsaw a crappy looking crosshair
* Change turret behavior again to make them even dumber (will not stay "spun up" anymore or retarget without spinning up again)
* DCC will not complain about an attack when something is deconstructed
* Fixed "\sell upgrades" command emptying energy weapons when a battery pack was sold with it
* Spectators moving to lock view points now set teleport bit, hopefully prevents the ugly lerping
Hive changes:
* Will not fire unless the missile can actually hit
* Will fire from the hive tip rather than the center
* Fixed broken code that made hive fire when shot from out of hive range
Diffstat (limited to 'src/game/g_combat.c')
| -rw-r--r-- | src/game/g_combat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 74b8b141..a347b921 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1018,7 +1018,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, // base is under attack warning if DCC'd if( targ->biteam == BIT_HUMANS && G_FindDCC( targ ) && - level.time > level.humanBaseAttackTimer ) + level.time > level.humanBaseAttackTimer && + mod != MOD_DECONSTRUCT && mod != MOD_SUICIDE ) { level.humanBaseAttackTimer = level.time + DC_ATTACK_PERIOD; G_BroadcastEvent( EV_DCC_ATTACK, 0 ); |