From: terencehill <piuntn@gmail.com>
Date: Mon, 17 Dec 2012 19:12:15 +0000 (+0100)
Subject: Cleanup
X-Git-Tag: xonotic-v0.7.0~61^2~83
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6a1f0e6a1d9c6952cfe395c35bcd9983d10bfa4;p=xonotic%2Fxonotic-data.pk3dir.git

Cleanup
---

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 39c2d136d..d16e7ad68 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -82,14 +82,7 @@ float freezetag_CheckWinner()
 
 	if(winner != world) // just in case a winner wasn't found
 	{
-		if(winner.team == COLOR_TEAM1)
-			teamname = "^1Red Team";
-		else if(winner.team == COLOR_TEAM2)
-			teamname = "^4Blue Team";
-		else if(winner.team == COLOR_TEAM3)
-			teamname = "^3Yellow Team";
-		else
-			teamname = "^6Pink Team";
+		teamname = ColoredTeamName(winner.team);
 		FOR_EACH_REALCLIENT(e)
 			centerprint(e, strcat(teamname, "^5 wins the round, all other teams were frozen."));
 		bprint(teamname, "^5 wins the round since all the other teams were frozen.\n");
diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 5f61dc01f..9f7f939dc 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -11,7 +11,7 @@ void round_handler_Think()
 
 	if(gameover)
 	{
-		round_handler_Stop();
+		round_handler_ResetCountdown();
 		round_handler_Remove();
 		return;
 	}
@@ -48,7 +48,7 @@ void round_handler_Think()
 		}
 		else
 		{
-			round_handler_Stop();
+			round_handler_ResetCountdown();
 		}
 		self.nextthink = time + 1; // canRoundStart every second
 	}
@@ -107,7 +107,7 @@ float round_handler_IsRoundStarted()
 	return (!round_handler.wait && !round_handler.cnt);
 }
 
-void round_handler_Stop()
+void round_handler_ResetCountdown()
 {
 	entity e;
 	if(round_handler.count)
@@ -117,7 +117,6 @@ void round_handler_Stop()
 			Send_CSQC_Centerprint_Generic_Expire(e, CPID_ROUND_STARTING);
 		round_handler.cnt = round_handler.count + 1;
 	}
-	round_handler.nextthink = 0;
 }
 
 void round_handler_Remove()
diff --git a/qcsrc/server/round_handler.qh b/qcsrc/server/round_handler.qh
index 7388b1ad4..2539e08fb 100644
--- a/qcsrc/server/round_handler.qh
+++ b/qcsrc/server/round_handler.qh
@@ -12,6 +12,6 @@ float round_handler_IsActive();
 float round_handler_AwaitingNextRound();
 float round_handler_CountdownRunning();
 float round_handler_IsRoundStarted();
-void round_handler_Stop();
+void round_handler_ResetCountdown();
 void round_handler_Remove();