X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftriggers.qc;h=9a7181d3a2250a530466a1d3dcbf59a9e9d1f0d8;hb=e0012447bfce1b551df3dc01b043655aa93dafad;hp=6968a6556a0ce2a18571a647603c228148c9bb4b;hpb=5aab6120acfc624751d20a695d1b911b3e919831;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapobjects/triggers.qc b/qcsrc/common/mapobjects/triggers.qc
index 6968a6556..9a7181d3a 100644
--- a/qcsrc/common/mapobjects/triggers.qc
+++ b/qcsrc/common/mapobjects/triggers.qc
@@ -1,7 +1,4 @@
 #include "triggers.qh"
-#ifdef SVQC
-	#include <server/item_key.qh>
-#endif
 
 void SUB_DontUseTargets(entity this, entity actor, entity trigger) { }
 
@@ -13,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)
 {
@@ -79,7 +65,7 @@ void generic_netlinked_reset(entity this)
 // Compatibility with old maps
 void generic_netlinked_legacy_use(entity this, entity actor, entity trigger)
 {
-	LOG_WARNF("Entity %s was (de)activated by a trigger, please update map to use relays", this.targetname);
+	//LOG_WARNF("Entity %s was (de)activated by a trigger, please update map to use relays", this.targetname);
 	this.setactive(this, ACTIVE_TOGGLE);
 }
 
@@ -316,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)
 					{
@@ -329,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;