Merge commit '40b7b8b8f77676', fixes #1937

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

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 5f61dc01f332a539386a629f47e90962d7e70498..af69e8e9e55d30a826f56d4bb6d78c384435ff39 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,54 +1,49 @@
 void round_handler_Think()
 {
-       entity e;
        float f;
 
-       if(inWarmupStage || time < game_starttime)
+       if(time < game_starttime)
        {
-               self.nextthink = time + 1;
+               round_handler_Reset(game_starttime);
                return;
        }
 
        if(gameover)
        {
-               round_handler_Stop();
+               round_handler_Reset(0);
                round_handler_Remove();
                return;
        }
 
        if(self.wait)
        {
-               reset_map(TRUE);
                self.wait = FALSE;
                self.cnt = self.count + 1; // init countdown
+               round_starttime = time + self.count;
+               reset_map(TRUE);
        }
 
        if(self.cnt > 0) // countdown running
        {
                if(self.canRoundStart())
                {
+                       if(self.cnt == self.count + 1)
+                               round_starttime = time + self.count;
                        f = self.cnt - 1;
-                       if(f == 5) Announce("prepareforbattle");
-                       else if(f == 3) Announce("3");
-                       else if(f == 2) Announce("2");
-                       else if(f == 1) Announce("1");
-                       else if(f == 0)
+                       if(f == 0)
                        {
-                               Announce("begin");
-                               FOR_EACH_REALCLIENT(e)
-                                       Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "^1Begin!", 1, 0);
                                self.cnt = 0;
+                               self.round_endtime = (self.round_timelimit) ? time + self.round_timelimit : 0;
                                self.nextthink = time;
+                               if(self.roundStart)
+                                       self.roundStart();
                                return;
                        }
-
-                       FOR_EACH_REALCLIENT(e)
-                               Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "Round will start in %d", 1, f);
                        self.cnt = self.cnt - 1;
                }
                else
                {
-                       round_handler_Stop();
+                       round_handler_Reset(0);
                }
                self.nextthink = time + 1; // canRoundStart every second
        }
@@ -67,7 +62,24 @@ void round_handler_Think()
        }
 }
 
-void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, float the_delay, float the_count)
+void round_handler_Init(float the_delay, float the_count, float the_round_timelimit)
+{
+       round_handler.delay = (the_delay > 0) ? the_delay : 0;
+       round_handler.count = fabs(floor(the_count));
+       round_handler.cnt = round_handler.count + 1;
+       round_handler.round_timelimit = (the_round_timelimit > 0) ? the_round_timelimit : 0;
+}
+
+// NOTE: this is only needed because if round_handler spawns at time 1
+// gamestarttime isn't initialized yet
+void round_handler_FirstThink()
+{
+       round_starttime = max(time, game_starttime) + round_handler.count;
+       round_handler.think = round_handler_Think;
+       round_handler.nextthink = max(time, game_starttime);
+}
+
+void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, void() roundStart_func)
 {
        if(round_handler)
        {
@@ -77,47 +89,23 @@ void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, f
        round_handler = spawn();
        round_handler.classname = "round_handler";
 
-       round_handler.think = round_handler_Think;
+       round_handler.think = round_handler_FirstThink;
        round_handler.canRoundStart = canRoundStart_func;
        round_handler.canRoundEnd = canRoundEnd_func;
-       round_handler.delay = (the_delay > 0) ? the_delay : 0;
-       round_handler.count = fabs(floor(the_count));
+       round_handler.roundStart = roundStart_func;
        round_handler.wait = FALSE;
-       round_handler.cnt = round_handler.count + 1;
+       round_handler_Init(5, 5, 180);
        round_handler.nextthink = time;
 }
 
-float round_handler_IsActive()
-{
-       return (round_handler && !inWarmupStage && time > game_starttime);
-}
-
-float round_handler_AwaitingNextRound()
-{
-       return (round_handler.wait);
-}
-
-float round_handler_CountdownRunning()
-{
-       return (!round_handler.wait && round_handler.cnt);
-}
-
-float round_handler_IsRoundStarted()
-{
-       return (!round_handler.wait && !round_handler.cnt);
-}
-
-void round_handler_Stop()
+void round_handler_Reset(float next_think)
 {
-       entity e;
+       round_handler.wait = FALSE;
        if(round_handler.count)
        if(round_handler.cnt < round_handler.count + 1)
-       {
-               FOR_EACH_REALCLIENT(e)
-                       Send_CSQC_Centerprint_Generic_Expire(e, CPID_ROUND_STARTING);
                round_handler.cnt = round_handler.count + 1;
-       }
-       round_handler.nextthink = 0;
+       round_handler.nextthink = next_think;
+       round_starttime = (next_think) ? (next_think + round_handler.count) : -1;
 }
 
 void round_handler_Remove()