Fix some things I forgot, and make ground impact particles work again

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 6f0a86127988ba4577aa0820d300b8513b94a245..505fde7a54afe8fea3c21f33fc3f267bd3c17549 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -866,31 +866,32 @@ void SV_PlayerPhysics()
                        tracebox(self.origin, self.mins, self.maxs, self.origin - '0 0 1', MOVE_NOMONSTERS, self);\r
                        if not(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS)\r
                        {\r
-                               if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)\r
-                               {\r
-                                       GlobalSound(globalsound_metalfall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, VOL_BASE);\r
-                                       pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', 1);\r
-                               }\r
-                               else\r
-                               {\r
-                                       GlobalSound(globalsound_fall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, VOL_BASE);\r
-                                       pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', 1);\r
-                               }\r
-\r
                                if(cvar("g_healthsize"))\r
                                {\r
                                        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', 1);\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', 1);\r
+                                       }\r
                                        sound(self, CHAN_AUTO, "misc/macro_hitground.wav", bound(0, VOL_BASE * playersize_macro(self), 1), ATTN_NORM);\r
                                }\r
                                else\r
                                {\r
                                        if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)\r
-                                               GlobalSound(globalsound_metalfall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE, 1));\r
+                                       {\r
+                                               GlobalSound(globalsound_metalfall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, VOL_BASE);\r
+                                               pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', 1);\r
+                                       }\r
                                        else\r
-                                               GlobalSound(globalsound_fall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE, 1));\r
+                                       {\r
+                                               GlobalSound(globalsound_fall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, VOL_BASE);\r
+                                               pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', 1);\r
+                                       }\r
                                }\r
                        }\r
                }\r

diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc
index 52a03c234b50d13605970a75632b4effa7a90ed7..28b470e0709ae3770a7c365c541dbb76a0395e0a 100644 (file)
--- a/data/qcsrc/server/sv_main.qc
+++ b/data/qcsrc/server/sv_main.qc
@@ -118,9 +118,9 @@ void CreatureFrame (void)
                                                else\r
                                                {\r
                                                        if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)\r
-                                                               GlobalSound(globalsound_metalstep, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE, 1));\r
+                                                               GlobalSound(globalsound_metalstep, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, VOL_BASE);\r
                                                        else\r
-                                                               GlobalSound(globalsound_step, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE, 1));\r
+                                                               GlobalSound(globalsound_step, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, VOL_BASE);\r
                                                }\r
                                        }\r
                                }\r