Merge branch 'master' into terencehill/lms_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / handicap.qc

diff --git a/qcsrc/server/handicap.qc b/qcsrc/server/handicap.qc
index 26c90c83711640c6b1bc976a72e056c10b261589..ce0d6cd0a6c10f3fe0653d33da3ed700b0d95fb2 100644 (file)
--- a/qcsrc/server/handicap.qc
+++ b/qcsrc/server/handicap.qc
@@ -6,23 +6,23 @@
 /// \copyright GNU GPLv2 or any later version.
 
 #include <common/state.qh>
-#include "client.qh"
+#include <server/client.qh>
 
 .float m_handicap; ///< Holds the handicap value.
 
 void Handicap_Initialize(entity player)
 {
-       player.m_handicap = 1;
+       CS(player).m_handicap = 1;
 }
 
 float Handicap_GetVoluntaryHandicap(entity player)
 {
-       return bound(1.0, CS(player).cvar_cl_handicap, 10.0);
+       return bound(1.0, CS_CVAR(player).cvar_cl_handicap, 10.0);
 }
 
 float Handicap_GetForcedHandicap(entity player)
 {
-       return player.m_handicap;
+       return (CS(player)) ? CS(player).m_handicap : 1;
 }
 
 void Handicap_SetForcedHandicap(entity player, float value)
@@ -31,7 +31,7 @@ void Handicap_SetForcedHandicap(entity player, float value)
        {
                error("Handicap_SetForcedHandicap: Invalid handicap value.");
        }
-       player.m_handicap = value;
+       CS(player).m_handicap = value;
 }
 
 float Handicap_GetTotalHandicap(entity player)