Fix a crash caused by display digits

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

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 2e278f5dbe4d6e1d1d8d4c687b762d7dec053dda..c22e5d53151ccb201c44e13f49330d9efa2e5f0d 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -596,6 +596,7 @@ void GetCvars(float f)
        GetCvars_handleFloat(s, f, cvar_cl_shownames, "cl_shownames");\r
        GetCvars_handleString(s, f, cvar_g_voretournamentversion, "g_voretournamentversion");\r
        GetCvars_handleFloat(s, f, cvar_cl_handicap, "cl_handicap");\r
+       GetCvars_handleFloat(s, f, cvar_cl_clippedspectating, "cl_clippedspectating");\r
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete);\r
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete);\r
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete);\r
@@ -1131,6 +1132,7 @@ float precache_sound_index (string s) = #19;
 #define SND_ATTENUATION 2\r
 #define SND_LARGEENTITY 8\r
 #define SND_LARGESOUND  16\r
+#define SND_SPEEDUSHORT4000 32\r
 \r
 float sound_allowed(float dest, entity e)\r
 {\r
@@ -1162,7 +1164,7 @@ void sound(entity e, float chan, string samp, float vol, float atten)
         return;\r
     sound_builtin(e, chan, samp, vol, atten);\r
 }\r
-void soundtoat(float dest, entity e, vector o, float chan, string samp, float vol, float atten)\r
+void soundtoat(float dest, entity e, vector o, float chan, string samp, float vol, float atten, float spd)\r
 {\r
     float entno, idx;\r
 \r
@@ -1182,6 +1184,8 @@ void soundtoat(float dest, entity e, vector o, float chan, string samp, float vo
         sflags |= SND_VOLUME;\r
     if (atten != 64)\r
         sflags |= SND_ATTENUATION;\r
+    if (spd)\r
+        sflags |= SND_SPEEDUSHORT4000;\r
     if (entno >= 8192)\r
         sflags |= SND_LARGEENTITY;\r
     if (idx >= 256)\r
@@ -1193,6 +1197,8 @@ void soundtoat(float dest, entity e, vector o, float chan, string samp, float vo
         WriteByte(dest, vol);\r
     if (sflags & SND_ATTENUATION)\r
         WriteByte(dest, atten);\r
+       if(sflags & SND_SPEEDUSHORT4000)\r
+               WriteShort(dest, spd * 4000);\r
     if (sflags & SND_LARGEENTITY)\r
     {\r
         WriteShort(dest, entno);\r
@@ -1211,7 +1217,7 @@ void soundtoat(float dest, entity e, vector o, float chan, string samp, float vo
     WriteCoord(dest, o_y);\r
     WriteCoord(dest, o_z);\r
 }\r
-void soundto(float dest, entity e, float chan, string samp, float vol, float atten)\r
+void soundto(float dest, entity e, float chan, string samp, float vol, float atten, float spd)\r
 {\r
     vector o;\r
 \r
@@ -1219,11 +1225,11 @@ void soundto(float dest, entity e, float chan, string samp, float vol, float att
         return;\r
 \r
     o = e.origin + 0.5 * (e.mins + e.maxs);\r
-    soundtoat(dest, e, o, chan, samp, vol, atten);\r
+    soundtoat(dest, e, o, chan, samp, vol, atten, spd);\r
 }\r
-void soundat(entity e, vector o, float chan, string samp, float vol, float atten)\r
+void soundat(entity e, vector o, float chan, string samp, float vol, float atten, float spd)\r
 {\r
-    soundtoat(MSG_BROADCAST, e, o, chan, samp, vol, atten);\r
+    soundtoat(MSG_BROADCAST, e, o, chan, samp, vol, atten, spd);\r
 }\r
 void stopsoundto(float dest, entity e, float chan)\r
 {\r
@@ -1274,7 +1280,7 @@ void play2(entity e, string filename)
     if (clienttype(e) == CLIENTTYPE_REAL)\r
     {\r
         msg_entity = e;\r
-        soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE);\r
+        soundtoat(MSG_ONE, world, '0 0 0', CHAN_AUTO, filename, VOL_BASE, ATTN_NONE, 0);\r
     }\r
 }\r
 \r
@@ -1338,6 +1344,8 @@ void precache_all_models(string pattern)
 \r
 void precache()\r
 {\r
+       float i;\r
+\r
     // gamemode related things\r
     precache_model ("models/misc/chatbubble.spr");\r
 \r
@@ -1399,6 +1407,8 @@ void precache()
     {\r
         PrecacheGlobalSound((globalsound_step = "misc/footstep0 6"));\r
         PrecacheGlobalSound((globalsound_metalstep = "misc/metalfootstep0 6"));\r
+               if(cvar("g_healthsize"))\r
+                       precache_sound("misc/macro_footstep.wav");\r
     }\r
 \r
     // gore and miscellaneous sounds\r
@@ -1419,6 +1429,8 @@ void precache()
        precache_sound ("misc/beep.wav");\r
     PrecacheGlobalSound((globalsound_fall = "misc/hitground 4"));\r
     PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4"));\r
+       if(cvar("g_healthsize"))\r
+               precache_sound("misc/macro_hitground.wav");\r
     precache_sound ("misc/null.wav");\r
     precache_sound ("misc/spawn.wav");\r
     precache_sound ("misc/talk.wav");\r
@@ -1449,9 +1461,19 @@ void precache()
     // common weapon precaches\r
     precache_sound ("weapons/weapon_switch.wav");\r
     precache_sound ("weapons/weaponpickup.wav");\r
-       precache_model ("models/weapons/w_displaydigit.md3");\r
 \r
-       float i;\r
+       // precache display digits\r
+       for(i = WEP_FIRST; i <= WEP_LAST; ++i)\r
+       {\r
+               entity e;\r
+               float w;\r
+               e = get_weaponinfo(i);\r
+               for(w = 1; fexists(strcat("models/weapons/v_", e.netname, "_digit1-", ftos(w) , ".md3")); w++)\r
+                       precache_model (strcat("models/weapons/v_", e.netname, "_digit1-", ftos(w) , ".md3"));\r
+               for(w = 1; fexists(strcat("models/weapons/v_", e.netname, "_digit2-", ftos(w) , ".md3")); w++)\r
+                       precache_model (strcat("models/weapons/v_", e.netname, "_digit2-", ftos(w) , ".md3"));\r
+       }\r
+\r
        for(i = 0; i < 8; i += 1)\r
                precache_sound (strcat("weapons/hit", ftos(i), ".wav"));\r
 \r
@@ -2286,7 +2308,7 @@ void SoundEntity_StartSound(entity pl, float chan, string samp, float vol, float
     p = pow(2, chan);\r
     if (pl.soundentity.cnt & p)\r
         return;\r
-    soundtoat(MSG_ALL, pl.soundentity, gettaginfo(pl.soundentity, 0), chan, samp, vol, attn);\r
+    soundtoat(MSG_ALL, pl.soundentity, gettaginfo(pl.soundentity, 0), chan, samp, vol, attn, 0);\r
     pl.soundentity.cnt |= p;\r
 }\r
 \r
@@ -2460,6 +2482,31 @@ void modeleffect_spawn(string m, float s, float f, vector o, vector v, vector an
        Net_LinkEntity(e, FALSE, 0.1, modeleffect_SendEntity);\r
 }\r
 \r
+float portrait_SendEntity(entity to, float sf)\r
+{\r
+       if(to != self.enemy)\r
+               return FALSE;\r
+\r
+       WriteByte(MSG_ENTITY, ENT_CLIENT_PORTRAIT);\r
+\r
+       WriteString(MSG_ENTITY, self.owner.playermodel);\r
+       WriteByte(MSG_ENTITY, stof(self.owner.playerskin));\r
+       WriteString(MSG_ENTITY, self.owner.netname);\r
+\r
+       return TRUE;\r
+}\r
+\r
+void portrait(entity pl, entity targ)\r
+{\r
+       entity e;\r
+       e = spawn();\r
+       e.classname = "portrait";\r
+       e.owner = pl;\r
+       e.enemy = targ;\r
+\r
+       Net_LinkEntity(e, FALSE, 0, portrait_SendEntity);\r
+}\r
+\r
 void shockwave_spawn(string m, vector org, float sz, float t1, float t2)\r
 {\r
        return modeleffect_spawn(m, 0, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);\r
@@ -2573,3 +2620,18 @@ void defer(float fdelay, void() func)
     e.think     = defer_think;\r
     e.nextthink = time + fdelay;\r
 }\r
+\r
+// returns 1 if player is at minimum size and 0 if player is at normal size\r
+float playersize_micro(entity e)\r
+{\r
+       if(!cvar("g_healthsize"))\r
+               return 0;\r
+       return bound(0, (e.health / cvar("g_healthsize_center") - 1) / (cvar("g_healthsize_min") / cvar("g_healthsize_center") - 1), 1);\r
+}\r
+// returns 0 if player is at normal size and 1 if player is at maximum size\r
+float playersize_macro(entity e)\r
+{\r
+       if(!cvar("g_healthsize"))\r
+               return 0;\r
+       return 1 - bound(0, (e.health / cvar("g_healthsize_max") - 1) / (cvar("g_healthsize_center") / cvar("g_healthsize_max") - 1), 1);\r
+}\r