X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftriggers.qc;h=9a7181d3a2250a530466a1d3dcbf59a9e9d1f0d8;hb=3ac61b98c83be079c61cf525491d2028b2a889dc;hp=6a20959997b34439e24d3fc7ceae7cbef35cb1fa;hpb=e044c33d2e56a13837659b0cdb0ac9a2e6242957;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapobjects/triggers.qc b/qcsrc/common/mapobjects/triggers.qc index 6a2095999..9a7181d3a 100644 --- a/qcsrc/common/mapobjects/triggers.qc +++ b/qcsrc/common/mapobjects/triggers.qc @@ -10,17 +10,6 @@ void DelayThink(entity this) delete(this); } -void FixSize(entity e) -{ - e.mins_x = rint(e.mins_x); - e.mins_y = rint(e.mins_y); - e.mins_z = rint(e.mins_z); - - e.maxs_x = rint(e.maxs_x); - e.maxs_y = rint(e.maxs_y); - e.maxs_z = rint(e.maxs_z); -} - #ifdef SVQC void generic_setactive(entity this, int act) { @@ -313,12 +302,9 @@ void SUB_UseTargets_Ex(entity this, entity actor, entity trigger, bool preventRe } if (s != "") { - // Flag to set func_clientwall state - // 1 == deactivate, 2 == activate, 0 == do nothing - int aw_flag = this.antiwall_flag; for(entity t = NULL; (t = find(t, targetname, s)); ) { - if(t.use && (t.sub_target_used != time || !preventReuse)) + if(t != this && t.use && (t.sub_target_used != time || !preventReuse)) { if(this.target_random) { @@ -326,9 +312,6 @@ void SUB_UseTargets_Ex(entity this, entity actor, entity trigger, bool preventRe } else { - if (t.classname == "func_clientwall" || t.classname == "func_clientillusionary") - t.antiwall_flag = aw_flag; - t.use(t, actor, this); if(preventReuse) t.sub_target_used = time;