Merge remote-tracking branch 'origin/divVerent/new-laser-by-morphed'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_jumppads.qc

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index abb0c306d6175a9d594f7bf759e604f8f082796f..cce0aab32bb5f062ca66a853f2a7996dfafef5c4 100644 (file)
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -200,6 +200,7 @@ void trigger_push_touch()
                                other.lastteleporttime = time;
 
                        if (!other.animstate_override)
+                       if (other.deadflag == DEAD_NO)
                        {
                                if (other.crouch)
                                        setanim(other, other.anim_duckjump, FALSE, TRUE, TRUE);
@@ -247,7 +248,7 @@ void trigger_push_touch()
                self.think = SUB_Remove;
                self.nextthink = time;
        }
-};
+}
 
 .vector dest;
 void trigger_push_findtarget()
@@ -303,7 +304,7 @@ void trigger_push_findtarget()
                waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity));
                remove(e);
        }
-};
+}
 
 /*
  * ENTITY PARAMETERS:
@@ -338,8 +339,8 @@ void spawnfunc_trigger_push()
 
        // this must be called to spawn the teleport waypoints for bots
        InitializeEntity(self, trigger_push_findtarget, INITPRIO_FINDTARGET);
-};
+}
 
-void spawnfunc_target_push() {};
-void spawnfunc_info_notnull() {};
-void spawnfunc_target_position() {};
+void spawnfunc_target_push() {}
+void spawnfunc_info_notnull() {}
+void spawnfunc_target_position() {}