X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_freezetag.qc;h=5ab96277b9e4a286a04999ab8c0832fb09d0fdc2;hb=3f25c5d552f540d8f5e0b2fe811eb7c011f04510;hp=9034887d82712e61b1144d312a424ea5812694b9;hpb=57e8b59f96ec28979c3dc01811412c9c26e60fdc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 9034887d8..5ab96277b 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -1,10 +1,17 @@
 .float freezetag_frozen_time;
 .float freezetag_frozen_timeout;
-.float freezetag_revive_progress;
 #define ICE_MAX_ALPHA 1
 #define ICE_MIN_ALPHA 0.1
 float freezetag_teams;
 
+#define SP_FREEZETAG_REVIVALS 4
+void freezetag_ScoreRules(float teams)
+{
+	ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, TRUE); // SFL_SORT_PRIO_PRIMARY
+	ScoreInfo_SetLabel_PlayerScore(SP_FREEZETAG_REVIVALS, "revivals", 0);
+	ScoreRules_basics_end();
+}
+
 void freezetag_count_alive_players()
 {
 	entity e;
@@ -198,7 +205,7 @@ void freezetag_Unfreeze(entity attacker)
 
 float freezetag_isEliminated(entity e)
 {
-	if(e.frozen == 1 || e.deadflag != DEAD_NO)
+	if(IS_PLAYER(e) && (e.frozen == 1 || e.deadflag != DEAD_NO))
 		return TRUE;
 	return FALSE;
 }
@@ -544,7 +551,7 @@ void freezetag_Initialize()
 	if(freezetag_teams < 2)
 		freezetag_teams = autocvar_g_freezetag_teams;
 	freezetag_teams = bound(2, freezetag_teams, 4);
-	ScoreRules_freezetag(freezetag_teams);
+	freezetag_ScoreRules(freezetag_teams);
 
 	round_handler_Spawn(freezetag_CheckTeams, freezetag_CheckWinner, func_null);
 	round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit);