take3: format 903 files

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

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 87c8dcc4ea8a41aae43dfdf86d53d239e0d79a9c..bc82508c76bed7a86b9737c99bd2baa0c3af5a16 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -21,45 +21,41 @@ void Announcer_Countdown(entity this)
 {
        float starttime = STAT(GAMESTARTTIME);
        float roundstarttime = STAT(ROUNDSTARTTIME);
-       if(roundstarttime == -1)
-       {
+       if (roundstarttime == -1) {
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
                delete(this);
                announcer_countdown = NULL;
                return;
        }
-       if(roundstarttime >= starttime)
+       if (roundstarttime >= starttime) {
                starttime = roundstarttime;
-       if(starttime <= time && roundstarttime != starttime) // game start time has passed
+       }
+       if (starttime <= time && roundstarttime != starttime) { // game start time has passed
                announcer_5min = announcer_1min = false; // reset maptime announcers now as well
-
+       }
        float countdown = (starttime - time);
        float countdown_rounded = floor(0.5 + countdown);
 
-       if(countdown <= 0) // countdown has finished, starttime is now
-       {
+       if (countdown <= 0) { // countdown has finished, starttime is now
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
                Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
                delete(this);
                announcer_countdown = NULL;
                return;
-       }
-       else // countdown is still going
-       {
-               // if concomitant countdown to round start overrides countdown to game start
-               if(roundstarttime == starttime)
-               {
+       } else { // countdown is still going
+                    // if concomitant countdown to round start overrides countdown to game start
+               if (roundstarttime == starttime) {
                        Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
                        Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
-                       if(annce_num != NULL)
+                       if (annce_num != NULL) {
                                Local_Notification(MSG_ANNCE, annce_num);
-               }
-               else
-               {
+                       }
+               } else {
                        Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
                        Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
-                       if(annce_num != NULL)
+                       if (annce_num != NULL) {
                                Local_Notification(MSG_ANNCE, annce_num);
+                       }
                }
 
                this.nextthink = (starttime - (countdown - 1));
@@ -73,20 +69,18 @@ void Announcer_Countdown(entity this)
  * timelimit, fraglimit and game_starttime! Requires engine changes (remove STAT_TIMELIMIT
  * and STAT_FRAGLIMIT to be auto-sent)
  */
- float previous_game_starttime;
+float previous_game_starttime;
 void Announcer_Gamestart()
 {
        float startTime = STAT(GAMESTARTTIME);
        float roundstarttime = STAT(ROUNDSTARTTIME);
-       if(roundstarttime > startTime)
+       if (roundstarttime > startTime) {
                startTime = roundstarttime;
-       if(intermission)
-       {
-               if(announcer_countdown)
-               {
+       }
+       if (intermission) {
+               if (announcer_countdown) {
                        centerprint_kill(ORDINAL(CPID_ROUND));
-                       if(announcer_countdown)
-                       {
+                       if (announcer_countdown) {
                                delete(announcer_countdown);
                                announcer_countdown = NULL;
                        }
@@ -94,58 +88,61 @@ void Announcer_Gamestart()
                return;
        }
 
-       if(previous_game_starttime != startTime)
-       {
-               if(time < startTime)
-               {
-                       if (!announcer_countdown)
-                       {
+       if (previous_game_starttime != startTime) {
+               if (time < startTime) {
+                       if (!announcer_countdown) {
                                announcer_countdown = new(announcer_countdown);
                                setthink(announcer_countdown, Announcer_Countdown);
                        }
 
-                       if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
-                       if(time > announcer_countdown.nextthink) // don't play it again if countdown was already going
-                               Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
+                       if (time + 5.0 < startTime) { // if connecting to server while restart was active don't always play prepareforbattle
+                               if (time > announcer_countdown.nextthink) { // don't play it again if countdown was already going
+                                       Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
+                               }
+                       }
 
-                       announcer_countdown.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime
+                       announcer_countdown.nextthink = startTime - floor(startTime - time); // synchronize nextthink to startTime
                }
        }
 
        previous_game_starttime = startTime;
 }
 
-#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN \
-       if(announcer_##minute##min) { \
-               if(timeleft > minute * 60) \
-                       announcer_##minute##min = false; \
-       } else { \
-               if(timeleft < minute * 60 && timeleft > minute * 60 - 1) { \
-                       announcer_##minute##min = true; \
-                       Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
+#define ANNOUNCER_CHECKMINUTE(minute) \
+       MACRO_BEGIN \
+               if (announcer_##minute##min) { \
+                       if (timeleft > minute * 60) { \
+                               announcer_##minute##min = false; \
+                       } \
+               } else { \
+                       if (timeleft < minute * 60 && timeleft > minute * 60 - 1) { \
+                               announcer_##minute##min = true; \
+                               Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
+                       } \
                } \
-       } \
-MACRO_END
+       MACRO_END
 
 void Announcer_Time()
 {
        float timeleft;
-       if(warmup_stage)
-       {
+       if (warmup_stage) {
                float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
-               if(warmup_timelimit > 0)
+               if (warmup_timelimit > 0) {
                        timeleft = max(0, warmup_timelimit - time);
-               else
+               } else {
                        timeleft = 0;
-       }
-       else
+               }
+       } else {
                timeleft = max(0, STAT(TIMELIMIT) * 60 + STAT(GAMESTARTTIME) - time);
+       }
 
-       if(autocvar_cl_announcer_maptime >= 2)
+       if (autocvar_cl_announcer_maptime >= 2) {
                ANNOUNCER_CHECKMINUTE(5);
+       }
 
-       if((autocvar_cl_announcer_maptime == 1) || (autocvar_cl_announcer_maptime == 3))
+       if ((autocvar_cl_announcer_maptime == 1) || (autocvar_cl_announcer_maptime == 3)) {
                ANNOUNCER_CHECKMINUTE(1);
+       }
 }
 
 void Announcer()