From: terencehill <piuntn@gmail.com>
Date: Thu, 12 Jan 2012 22:23:32 +0000 (+0100)
Subject: .blocked --> .player_blocked so that it compiles...
X-Git-Tag: xonotic-v0.6.0~42^2~7^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2726deea1aee754fb5a5a1deed898e44b5a7822f;p=xonotic%2Fxonotic-data.pk3dir.git

.blocked --> .player_blocked so that it compiles...
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index d9bcf5c3e1..6dc7593b28 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -256,7 +256,7 @@ void Arena_Warmup()
 			FOR_EACH_CLIENT(e)
 			{
 				if(e.spawned && e.classname == "player")
-					e.blocked = 1;
+					e.player_blocked = 1;
 			}
 		}
 	}
@@ -277,8 +277,8 @@ void Arena_Warmup()
 		if(g_arena) {
 			FOR_EACH_CLIENT(e)
 			{
-				if(e.blocked)
-					e.blocked = 0;
+				if(e.player_blocked)
+					e.player_blocked = 0;
 			}
 		}
 	}
diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 2f714869a2..51bfc62c63 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -875,7 +875,7 @@ void SV_PlayerPhysics()
 
 	MUTATOR_CALLHOOK(PlayerPhysics);
 
-	if(self.blocked)
+	if(self.player_blocked)
 	{
 		self.movement = '0 0 0';
 		self.disableclientprediction = 1;
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 17d70348ef..1dc3e9b7c3 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -643,7 +643,7 @@ float serverflags;
 
 .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator
 
-.float blocked;
+.float player_blocked;
 
 .float freezetag_frozen;
 .float freezetag_revive_progress;