Make spectating vehicle work, a little (chase is now ok, still no good for first...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mode_onslaught.qc

diff --git a/qcsrc/server/mode_onslaught.qc b/qcsrc/server/mode_onslaught.qc
index f6e3de4cddf854cf024b8a9f4ad6f3d51caac1b3..ebca6ee2b7b4353ba16afe6b76a941973e1ffcc5 100644 (file)
--- a/qcsrc/server/mode_onslaught.qc
+++ b/qcsrc/server/mode_onslaught.qc
@@ -400,7 +400,10 @@ void onslaught_generator_think()
                                                d = d + 1;
                                e = e.chain;
                        }
-                       d = d * self.max_health / 300;
+                       if(autocvar_g_campaign && autocvar__campaign_testrun)
+                               d = d * self.max_health;
+                       else
+                               d = d * self.max_health / max(30, 60 * autocvar_timelimit_suddendeath);
                        Damage(self, self, self, d, DEATH_HURTTRIGGER, self.origin, '0 0 0');
                }
                else if (overtime_msg_time)
@@ -949,6 +952,7 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
 
        if (attacker.classname == "player")
        {
+               nag = FALSE;
                if(self.team == COLOR_TEAM1)
                {
                        if(time - ons_notification_time_team1 > 10)