X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fplatforms.qc;h=10af3e1944316a7f1b6299297cfbd6a3686cb3d3;hb=0d34650737898101ccba01d77bfa6ab52fc37619;hp=c1f481f8af515a262c516ac2b56c3ea698d22148;hpb=5972fcfdf1ffe5bef1df9edc2de2944abbeba280;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/platforms.qc b/qcsrc/common/triggers/platforms.qc index c1f481f8a..10af3e194 100644 --- a/qcsrc/common/triggers/platforms.qc +++ b/qcsrc/common/triggers/platforms.qc @@ -1,3 +1,4 @@ +#include "platforms.qh" void generic_plat_blocked(entity this, entity blocker) { #ifdef SVQC @@ -23,7 +24,7 @@ void plat_spawn_inside_trigger(entity this) trigger = spawn(); settouch(trigger, plat_center_touch); - trigger.movetype = MOVETYPE_NONE; + set_movetype(trigger, MOVETYPE_NONE); trigger.solid = SOLID_TRIGGER; trigger.enemy = this; @@ -53,7 +54,7 @@ void plat_spawn_inside_trigger(entity this) } // otherwise, something is fishy... - remove(trigger); + delete(trigger); objerror(this, "plat_spawn_inside_trigger: platform has odd size or lip, can't spawn"); } @@ -128,13 +129,8 @@ void plat_outside_touch(entity this, entity toucher) void plat_trigger_use(entity this, entity actor, entity trigger) { -#ifdef SVQC if (getthink(this)) return; // already activated -#elif defined(CSQC) - if(this.move_think) - return; -#endif plat_go_down(this); }