X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_jumppads.qc;h=36048e860129a1d79030939b3d8c2238828a8062;hb=2cadc72988aea7350f32343cf31adeeddade0c8e;hp=df5788f4c3a0ff251854b2fd9d5235b23b99a073;hpb=6af4e73de035e6bbed9ba2d60e0768c43dc66f2a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc index df5788f4c..36048e860 100644 --- a/qcsrc/server/t_jumppads.qc +++ b/qcsrc/server/t_jumppads.qc @@ -35,7 +35,7 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht) torg = tgt.origin + (tgt.mins + tgt.maxs) * 0.5; - grav = cvar("sv_gravity"); + grav = autocvar_sv_gravity; zdist = torg_z - org_z; sdist = vlen(torg - org - zdist * '0 0 1'); @@ -137,6 +137,7 @@ void trigger_push_touch() if (other.classname != "gib") if (other.classname != "casing") if (other.classname != "droppedweapon") + if (other.classname != "keepawayball") if (!other.projectiledeathtype || other.classname == "bullet") return; @@ -285,8 +286,7 @@ void trigger_push_findtarget() */ void spawnfunc_trigger_push() { - if (self.angles != '0 0 0') - SetMovedir (); + SetMovedir (); EXACTTRIGGER_INIT;