Offset the names for scaled players, to match the proper scale

[voretournament/voretournament.git] / data / qcsrc / server / cl_client.qc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 13133ad5e3f9b46c4a909ad4d4a9f22118856080..94f5936c99f66a1725cb1aa3769629630b232322 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -436,9 +436,9 @@ string setmodel_state()
        newmodel_extension = substring(self.playermodel, strlen(self.playermodel) - 4, 4);\r
 \r
        float vore_state;\r
-       if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.666666666666))\r
+       if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.6))\r
                vore_state = 3;\r
-       else if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.333333333333))\r
+       else if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.3))\r
                vore_state = 2;\r
        else if(self.stomach_load)\r
                vore_state = 1;\r
@@ -523,7 +523,7 @@ float Client_customizeentityforclient()
        // this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww)\r
        stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
 \r
-       if(other.spectatee_status == num_for_edict(other.enemy))\r
+       if(other.spectatee_status && other.spectatee_status == num_for_edict(other.enemy))\r
                other = other.enemy; // also do this for the player we are spectating\r
 \r
        // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view\r
@@ -1044,6 +1044,14 @@ float ClientInit_SendEntity(entity to, float sf)
 \r
        WriteCoord(MSG_ENTITY, cvar("g_vore"));\r
        WriteCoord(MSG_ENTITY, g_balance_vore_swallow_limit);\r
+       WriteCoord(MSG_ENTITY, cvar("g_healthsize"));\r
+\r
+       // tell the client if this server uses armor\r
+       float armor_max;\r
+       if(cvar("g_balance_armor_start") || (cvar("g_lms") && cvar("g_lms_start_armor")) /*|| (inWarmupStage && cvar("g_warmup_start_armor"))*/ || cvar("g_balance_armor_regen") || cvar("g_balance_armor_regenlinear"))\r
+               armor_max = cvar("g_balance_armor_limit");\r
+       WriteCoord(MSG_ENTITY, armor_max);\r
+\r
        return TRUE;\r
 }\r
 \r