Same thing for items

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

diff --git a/data/qcsrc/server/sv_main.qc b/data/qcsrc/server/sv_main.qc
index 3bf49db91deca33f6a8f2d3ef7f654b252f23956..e49283c69874beb447c485321e50fe7b623cf609 100644 (file)
--- a/data/qcsrc/server/sv_main.qc
+++ b/data/qcsrc/server/sv_main.qc
@@ -115,23 +115,31 @@ void CreatureFrame (void)
                                                                GlobalSound(globalsound_step, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE * (1 - playersize_micro(self)), 1));\r
                                                        sound(self, CHAN_AUTO, "misc/macro_footstep.wav", bound(0, VOL_BASE * playersize_macro(self), 1), ATTN_NORM);\r
 \r
-                                                       entity head;\r
-                                                       for(head = findradius(self.origin, cvar("g_healthsize_quake_step_radius")); head; head = head.chain)\r
+                                                       // earthquake effect for nearby players when a macro walks by\r
+                                                       if(cvar("g_healthsize_quake_step"))\r
                                                        {\r
-                                                               if(head.classname != "player")\r
-                                                                       continue;\r
-\r
-                                                               float shake;\r
-                                                               shake = vlen(head.origin - self.origin);\r
-                                                               if(shake)\r
-                                                                       shake = 1 - (shake / cvar("g_healthsize_quake_step_radius"));\r
-                                                               shake *= cvar("g_healthsize_quake_step");\r
-\r
-                                                               head.punchvector_x += crandom() * shake;\r
-                                                               head.punchvector_y += crandom() * shake;\r
-                                                               head.punchvector_z += crandom() * shake;\r
-\r
-                                                               dprint(strcat(head.netname, " | ", ftos(shake), " --------\n"));\r
+                                                               entity head;\r
+                                                               for(head = findradius(self.origin, cvar("g_healthsize_quake_step_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_step_radius"), 1);\r
+                                                                       shake *= playersize_macro(self) * cvar("g_healthsize_quake_step");\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