Make particles depend on player scale even more

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

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 3dd65f7c8f0e958138e5a145e4cdacf0075395e1..9e000474b19d2c722196a1782ec299f26cb34b32 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -738,7 +738,7 @@ void SV_PlayerPhysics()
 \r
        if (self.punchangle != '0 0 0')\r
        {\r
-               f = vlen(self.punchangle) - 15 * frametime;\r
+               f = vlen(self.punchangle) - cvar("sv_punchangle_speed") * frametime;\r
                if (f > 0)\r
                        self.punchangle = normalize(self.punchangle) * f;\r
                else\r
@@ -747,7 +747,7 @@ void SV_PlayerPhysics()
 \r
        if (self.punchvector != '0 0 0')\r
        {\r
-               f = vlen(self.punchvector) - 30 * frametime;\r
+               f = vlen(self.punchvector) - cvar("sv_punchvector_speed") * frametime;\r
                if (f > 0)\r
                        self.punchvector = normalize(self.punchvector) * f;\r
                else\r
@@ -871,14 +871,41 @@ void SV_PlayerPhysics()
                                        if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)\r
                                        {\r
                                                GlobalSound(globalsound_metalfall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE * (1 - playersize_micro(self)), 1));\r
-                                               pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', self.scale);\r
+                                               pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', floor(self.scale * PARTICLE_MULTIPLIER));\r
                                        }\r
                                        else\r
                                        {\r
                                                GlobalSound(globalsound_fall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE * (1 - playersize_micro(self)), 1));\r
-                                               pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', self.scale);\r
+                                               pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', floor(self.scale * PARTICLE_MULTIPLIER));\r
                                        }\r
                                        sound(self, CHAN_AUTO, "misc/macro_hitground.wav", bound(0, VOL_BASE * playersize_macro(self), 1), ATTN_NORM);\r
+\r
+                                       // earthquake effect for nearby players when a macro falls\r
+                                       if(cvar("g_healthsize_quake_fall"))\r
+                                       {\r
+                                               entity head;\r
+                                               for(head = findradius(self.origin, cvar("g_healthsize_quake_fall_radius")); head; head = head.chain)\r
+                                               {\r
+                                                       if not(head.classname == "player" || head.classname == "spectator")\r
+                                                               continue;\r
+                                                       if(head == self || head.spectatee_status == num_for_edict(self))\r
+                                                               continue; // not for self\r
+                                                       if not(head.flags & FL_ONGROUND)\r
+                                                               continue; // we only feel the ground shaking if we are sitting on it\r
+                                                       if(head.stat_eaten)\r
+                                                               continue; // not for prey\r
+\r
+                                                       float shake;\r
+                                                       shake = vlen(head.origin - self.origin);\r
+                                                       if(shake)\r
+                                                               shake = 1 - bound(0, shake / cvar("g_healthsize_quake_fall_radius"), 1);\r
+                                                       shake *= playersize_macro(self) * cvar("g_healthsize_quake_fall");\r
+\r
+                                                       head.punchvector_x += crandom() * shake;\r
+                                                       head.punchvector_y += crandom() * shake;\r
+                                                       head.punchvector_z += crandom() * shake;\r
+                                               }\r
+                                       }\r
                                }\r
                                else\r
                                {\r