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

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index d9bcf5c3e1a802b7f554487f8beb709caa3872fc..6dc7593b28e80ffa94fcf1941dec36c593d53dde 100644 (file)
--- 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 2f714869a272ae86d0d5092dedb61c2b7ab45683..51bfc62c6382a3fcf3c64e5aa22e4ebb8812c654 100644 (file)
--- 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 17d70348ef0de1bd6274e6181c580a89b53b8e53..1dc3e9b7c3a67ad1aee7ce4235d9a5f40aec65b0 100644 (file)
--- 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;