X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fround_handler.qc;h=d5b0281338ac22f1999db48338432feb482f0af2;hb=e744d300162d41aec3e2a7f146012635e040b77a;hp=8715a4deaa56cee9abe8d74bd4a4f4dfa8817125;hpb=02a0bd5bf9eefad8c97b93c8a1c2ea47b3c1f553;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 8715a4dea..d5b028133 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,3 +1,9 @@
+#include "round_handler.qh"
+#include "_all.qh"
+
+#include "command/vote.qh"
+#include "../common/util.qh"
+
 void round_handler_Think()
 {
 	float f;
@@ -17,10 +23,10 @@ void round_handler_Think()
 
 	if(self.wait)
 	{
-		self.wait = FALSE;
+		self.wait = false;
 		self.cnt = self.count + 1; // init countdown
 		round_starttime = time + self.count;
-		reset_map(TRUE);
+		reset_map(true);
 	}
 
 	if(self.cnt > 0) // countdown running
@@ -33,7 +39,7 @@ void round_handler_Think()
 			if(f == 0)
 			{
 				self.cnt = 0;
-				self.round_endtime = time + self.round_timelimit;
+				self.round_endtime = (self.round_timelimit) ? time + self.round_timelimit : 0;
 				self.nextthink = time;
 				if(self.roundStart)
 					self.roundStart();
@@ -52,7 +58,7 @@ void round_handler_Think()
 		if(self.canRoundEnd())
 		{
 			// schedule a new round
-			self.wait = TRUE;
+			self.wait = true;
 			self.nextthink = time + self.delay;
 		}
 		else
@@ -67,7 +73,7 @@ void round_handler_Init(float the_delay, float the_count, float the_round_timeli
 	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 = max(10, the_round_timelimit);
+	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
@@ -93,14 +99,14 @@ void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, v
 	round_handler.canRoundStart = canRoundStart_func;
 	round_handler.canRoundEnd = canRoundEnd_func;
 	round_handler.roundStart = roundStart_func;
-	round_handler.wait = FALSE;
+	round_handler.wait = false;
 	round_handler_Init(5, 5, 180);
 	round_handler.nextthink = time;
 }
 
 void round_handler_Reset(float next_think)
 {
-	round_handler.wait = FALSE;
+	round_handler.wait = false;
 	if(round_handler.count)
 	if(round_handler.cnt < round_handler.count + 1)
 		round_handler.cnt = round_handler.count + 1;