try renaming charge_pool to chargepool to make the cvar name a bit shorter

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

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 7e6a9894288013df585ef8075e0bc16c242ca11f..a13f4afbc2d7939142d7999c7daa23377c3742a7 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -802,8 +802,8 @@ void FixPlayermodel()
 
        if(!teams_matter)
                if(strlen(cvar_string("sv_defaultplayercolors")))
-                       if(self.clientcolors != cvar("sv_defaultplayercolors"))
-                               setcolor(self, cvar("sv_defaultplayercolors"));
+                       if(self.clientcolors != stof(cvar_string("sv_defaultplayercolors")))
+                               setcolor(self, stof(cvar_string("sv_defaultplayercolors")));
 }
 
 void PlayerTouchExplode(entity p1, entity p2)
@@ -900,8 +900,8 @@ void PutClientInServer (void)
                self.dmg = 2;
                if(cvar("g_balance_nex_charge"))
                {
-                       if(cvar("g_balance_nex_secondary_charge_pool"))
-                               self.nex_charge_pool_ammo = 1;
+                       if(cvar("g_balance_nex_secondary_chargepool"))
+                               self.nex_chargepool_ammo = 1;
                        self.nex_charge = cvar("g_balance_nex_charge_start");
                }
 
@@ -1347,6 +1347,10 @@ void ClientKill (void)
        {
                // do nothing
        }
+    else if(g_freezetag && self.freezetag_frozen == 1)
+    {
+        // do nothing
+    }
        else
                ClientKill_TeamChange(0);
 }
@@ -3061,7 +3065,7 @@ void PlayerPostThink (void)
 
        playerdemo_write();
 
-       if((g_cts || g_race) && self.cvar_cl_allow_uid2name)
+       if((g_cts || g_race) && self.cvar_cl_allow_uid2name == 1)
        {
                if(!self.stored_netname)
                        self.stored_netname = strzone(uid2name(self.crypto_idfp));