Draw: purge SELFPARAM

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / announcer.qc

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 5de03953cd4e4dc3a25c7a541a7dcc43c5f907e6..b7b7bb5c6e5d992c2a8c20ea1e9f8c8bce7332f2 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,22 +1,21 @@
 #include "announcer.qh"
 #include "announcer.qh"

+#include "_all.qh"

 
 

-#include "autocvars.qh"
-#include "main.qh"

 #include "../common/notifications.qh"
 #include "../common/stats.qh"
 #include "../common/util.qh"
 #include "../common/notifications.qh"
 #include "../common/stats.qh"
 #include "../common/util.qh"

-#include "../dpdefs/csprogsdefs.qh"

 
 bool announcer_1min;
 bool announcer_5min;
 void Announcer_Countdown()
 {
 
 bool announcer_1min;
 bool announcer_5min;
 void Announcer_Countdown()
 {

+       SELFPARAM();

        float starttime = getstatf(STAT_GAMESTARTTIME);
        float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
        if(roundstarttime == -1)
        {
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
        float starttime = getstatf(STAT_GAMESTARTTIME);
        float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
        if(roundstarttime == -1)
        {
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);

-               remove(self);
+               remove(this);

                return;
        }
        if(roundstarttime >= starttime)
                return;
        }
        if(roundstarttime >= starttime)


@@ -31,7 +30,7 @@ void Announcer_Countdown()
        {
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
                Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
        {
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
                Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);

-               remove(self);
+               remove(this);

                return;
        }
        else // countdown is still going
                return;
        }
        else // countdown is still going


@@ -48,7 +47,7 @@ void Announcer_Countdown()
                        Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
                }
 
                        Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
                }
 

-               self.nextthink = (starttime - (countdown - 1));
+               this.nextthink = (starttime - (countdown - 1));

        }
 }
 
        }
 }