X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fcampcheck%2Fcampcheck.qc;h=191f61681583ab70092cde44e2eb49ff2fb9a18e;hb=b9671f63469586007314131f3f53728795c035cd;hp=0ba0bb64e1f93f98831c38f54b940e9c9766f6cb;hpb=65cb7f7edc8fd2de641b1221156efb4cd132ba34;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
index 0ba0bb64e..191f61681 100644
--- a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
+++ b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
@@ -9,14 +9,17 @@ REGISTER_MUTATOR(campcheck, cvar("g_campcheck"));
 .float campcheck_traveled_distance;
 
 MUTATOR_HOOKFUNCTION(campcheck, PlayerDies)
-{SELFPARAM();
-	Kill_Notification(NOTIF_ONE, self, MSG_CENTER_CPID, CPID_CAMPCHECK);
-
-	return false;
+{
+	entity frag_target = M_ARGV(2, entity);
+	
+	Kill_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CPID_CAMPCHECK);
 }
 
 MUTATOR_HOOKFUNCTION(campcheck, PlayerDamage_Calculate)
 {
+	entity frag_attacker = M_ARGV(1, entity);
+	entity frag_target = M_ARGV(2, entity);
+
 	if(IS_PLAYER(frag_target))
 	if(IS_PLAYER(frag_attacker))
 	if(frag_attacker != frag_target)
@@ -24,67 +27,65 @@ MUTATOR_HOOKFUNCTION(campcheck, PlayerDamage_Calculate)
 		frag_target.campcheck_traveled_distance = autocvar_g_campcheck_distance;
 		frag_attacker.campcheck_traveled_distance = autocvar_g_campcheck_distance;
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(campcheck, PlayerPreThink)
-{SELFPARAM();
+{
+	entity player = M_ARGV(0, entity);
+
 	if(!gameover)
 	if(!warmup_stage) // don't consider it camping during warmup?
 	if(time >= game_starttime)
-	if(IS_PLAYER(self))
-	if(IS_REAL_CLIENT(self)) // bots may camp, but that's no reason to constantly kill them
-	if(self.deadflag == DEAD_NO)
-	if(!self.frozen)
-	if(!self.BUTTON_CHAT)
+	if(IS_PLAYER(player))
+	if(IS_REAL_CLIENT(player)) // bots may camp, but that's no reason to constantly kill them
+	if(!IS_DEAD(player))
+	if(!STAT(FROZEN, player))
+	if(!PHYS_INPUT_BUTTON_CHAT(player))
 	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 = player.prevorigin - player.origin;
 		dist.z = 0;
-		self.campcheck_traveled_distance += fabs(vlen(dist));
+		player.campcheck_traveled_distance += fabs(vlen(dist));
 
 		if((autocvar_g_campaign && !campaign_bots_may_start) || (time < game_starttime) || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
 		{
-			self.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
-			self.campcheck_traveled_distance = 0;
+			player.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
+			player.campcheck_traveled_distance = 0;
 		}
 
-		if(time > self.campcheck_nextcheck)
+		if(time > player.campcheck_nextcheck)
 		{
-			if(self.campcheck_traveled_distance < autocvar_g_campcheck_distance)
+			if(player.campcheck_traveled_distance < autocvar_g_campcheck_distance)
 			{
-				Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_CAMPCHECK);
-				if(self.vehicle)
-					Damage(self.vehicle, self, self, autocvar_g_campcheck_damage * 2, DEATH_CAMP.m_id, self.vehicle.origin, '0 0 0');
+				Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_CAMPCHECK);
+				if(player.vehicle)
+					Damage(player.vehicle, NULL, NULL, autocvar_g_campcheck_damage * 2, DEATH_CAMP.m_id, player.vehicle.origin, '0 0 0');
 				else
-					Damage(self, self, self, bound(0, autocvar_g_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, self.origin, '0 0 0');
+					Damage(player, NULL, NULL, bound(0, autocvar_g_campcheck_damage, player.health + player.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, player.origin, '0 0 0');
 			}
-			self.campcheck_nextcheck = time + autocvar_g_campcheck_interval;
-			self.campcheck_traveled_distance = 0;
+			player.campcheck_nextcheck = time + autocvar_g_campcheck_interval;
+			player.campcheck_traveled_distance = 0;
 		}
 
-		return false;
+		return;
 	}
 
-	self.campcheck_nextcheck = time + autocvar_g_campcheck_interval; // one of the above checks failed, so keep the timer up to date
-	return false;
+	player.campcheck_nextcheck = time + autocvar_g_campcheck_interval; // one of the above checks failed, so keep the timer up to date
 }
 
 MUTATOR_HOOKFUNCTION(campcheck, PlayerSpawn)
-{SELFPARAM();
-	self.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
-	self.campcheck_traveled_distance = 0;
+{
+	entity player = M_ARGV(0, entity);
 
-	return false;
+	player.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
+	player.campcheck_traveled_distance = 0;
 }
 
 MUTATOR_HOOKFUNCTION(campcheck, BuildMutatorsString)
 {
-	ret_string = strcat(ret_string, ":CampCheck");
-	return false;
+	M_ARGV(0, string) = strcat(M_ARGV(0, string), ":CampCheck");;
 }
 #endif