X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_campcheck.qc;h=bacc590b78d731f3d639ae99cbf7cbbc3ef554f8;hb=98e1375c9938f3d86d6f8e28f44cd6af74d2fc0e;hp=fb20d1cff2ea83e829708ba30bd999f2518bb7b5;hpb=ef3193f7a8b94d570b83a09e5f75ba2c87fe2bb9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_campcheck.qc b/qcsrc/server/mutators/mutator_campcheck.qc
index fb20d1cff..bacc590b7 100644
--- a/qcsrc/server/mutators/mutator_campcheck.qc
+++ b/qcsrc/server/mutators/mutator_campcheck.qc
@@ -1,3 +1,9 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
+#include "../campaign.qh"
+
 .float campcheck_nextcheck;
 .float campcheck_traveled_distance;
 
@@ -5,7 +11,7 @@ MUTATOR_HOOKFUNCTION(campcheck_PlayerDies)
 {
 	Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_CAMPCHECK);
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerDamage)
@@ -18,20 +24,21 @@ MUTATOR_HOOKFUNCTION(campcheck_PlayerDamage)
 		frag_attacker.campcheck_traveled_distance = autocvar_g_campcheck_distance;
 	}
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerThink)
 {
 	if(IS_PLAYER(self))
 	if(self.deadflag == DEAD_NO)
+	if(!self.frozen)
 	if(autocvar_g_campcheck_interval)
 	{
 		vector dist;
 
 		// calculate player movement (in 2 dimensions only, so jumping on one spot doesn't count as movement)
 		dist = self.prevorigin - self.origin;
-		dist_z = 0;
+		dist.z = 0;
 		self.campcheck_traveled_distance += fabs(vlen(dist));
 
 		if((autocvar_g_campaign && !campaign_bots_may_start) || (time < game_starttime) || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
@@ -55,7 +62,7 @@ MUTATOR_HOOKFUNCTION(campcheck_PlayerThink)
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerSpawn)
@@ -63,13 +70,13 @@ MUTATOR_HOOKFUNCTION(campcheck_PlayerSpawn)
 	self.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
 	self.campcheck_traveled_distance = 0;
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_BuildMutatorsString)
 {
 	ret_string = strcat(ret_string, ":CampCheck");
-	return FALSE;
+	return false;
 }
 
 MUTATOR_DEFINITION(mutator_campcheck)
@@ -80,5 +87,5 @@ MUTATOR_DEFINITION(mutator_campcheck)
 	MUTATOR_HOOK(PlayerSpawn, campcheck_PlayerSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(BuildMutatorsString, campcheck_BuildMutatorsString, CBC_ORDER_ANY);
 
-	return FALSE;
+	return false;
 }