X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_teleporters.qc;h=eba0ea0681b3ee22edfcc378e7ca1c23f1027b17;hb=69ecc894118221039e2cc377d0bf7c46f2db6dcb;hp=26acf7f0ead9d4f59a5d2f5c1d8770afbf0ba3f3;hpb=777ca1aaba7e571c96473f75e39012c42f2375af;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc index 26acf7f0e..eba0ea068 100644 --- a/qcsrc/server/t_teleporters.qc +++ b/qcsrc/server/t_teleporters.qc @@ -154,6 +154,9 @@ void Teleport_Touch (void) float p; string s; + if (self.active != ACTIVE_ACTIVE) + return; + if (other.health < 1) return; if not(other.flags & FL_CLIENT) // FIXME: Make missiles firable through the teleport too @@ -292,7 +295,9 @@ void spawnfunc_trigger_teleport (void) self.angles = '0 0 0'; EXACTTRIGGER_INIT; - + + self.active = ACTIVE_ACTIVE; + self.use = trigger_teleport_use; // this must be called to spawn the teleport waypoints for bots