First attempt to make health possible to swallow slowly. Incomplete and still buggy...

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

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 2c3fff3f9c80c8deda4e8239b546054f53093a17..c22e5d53151ccb201c44e13f49330d9efa2e5f0d 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1198,7 +1198,7 @@ void soundtoat(float dest, entity e, vector o, float chan, string samp, float vo
     if (sflags & SND_ATTENUATION)\r
         WriteByte(dest, atten);\r
        if(sflags & SND_SPEEDUSHORT4000)\r
-               WriteShort(dest, 4000 * spd);\r
+               WriteShort(dest, spd * 4000);\r
     if (sflags & SND_LARGEENTITY)\r
     {\r
         WriteShort(dest, entno);\r
@@ -1344,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
@@ -1405,8 +1407,8 @@ void precache()
     {\r
         PrecacheGlobalSound((globalsound_step = "misc/footstep0 6"));\r
         PrecacheGlobalSound((globalsound_metalstep = "misc/metalfootstep0 6"));\r
-\r
-        precache_sound("misc/macro_footstep.wav");\r
+               if(cvar("g_healthsize"))\r
+                       precache_sound("misc/macro_footstep.wav");\r
     }\r
 \r
     // gore and miscellaneous sounds\r
@@ -1427,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
@@ -1457,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