X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftarget%2Fspawn.qc;h=74ac8fd99ad8899e6d556cbf9837929f0e2b2664;hp=38eabbab333da033bc0c5fda7cbfd1975f48bd92;hb=847371860eeb17f6a51aa1fa532aa997cb2d760b;hpb=802d673ea15260b02ce6760839cc40a2a57b21b1

diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc
index 38eabbab3..74ac8fd99 100644
--- a/qcsrc/common/triggers/target/spawn.qc
+++ b/qcsrc/common/triggers/target/spawn.qc
@@ -1,9 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../../server/_all.qh"
-    #include "../../util.qh"
-    #include "../../../server/defs.qh"
+    #include <common/util.qh>
+    #include <server/defs.qh>
 #endif
 
 #ifdef SVQC
@@ -16,7 +15,7 @@
 //   2 = trigger on map load
 
 float target_spawn_initialized;
-.void() target_spawn_spawnfunc;
+.void(entity this) target_spawn_spawnfunc;
 float target_spawn_spawnfunc_field;
 .entity target_spawn_activator;
 .float target_spawn_id;
@@ -24,7 +23,7 @@ float target_spawn_count;
 
 void target_spawn_helper_setmodel()
 {SELFPARAM();
-	setmodel(self, self.model);
+	_setmodel(self, self.model);
 }
 
 void target_spawn_helper_setsize()
@@ -32,13 +31,12 @@ void target_spawn_helper_setsize()
 	setsize(self, self.mins, self.maxs);
 }
 
-void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity t3, entity t4, entity act)
-{SELFPARAM();
+void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, entity t2, entity t3, entity t4, entity act, entity trigger)
+{
 	float i, n, valuefieldpos;
 	string key, value, valuefield, valueoffset, valueoffsetrandom;
 	entity valueent;
 	vector data, data2;
-	entity oldactivator;
 
 	n = tokenize_console(msg);
 
@@ -98,7 +96,7 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 
 				if(value == "self")
 				{
-					valueent = self;
+					valueent = this;
 					value = "";
 				}
 				else if(value == "activator")
@@ -108,7 +106,7 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 				}
 				else if(value == "other")
 				{
-					valueent = other;
+					valueent = trigger;
 					value = "";
 				}
 				else if(value == "pusher")
@@ -158,7 +156,7 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 				if(valuefield == "")
 				{
 					if(value == "")
-						value = ftos(num_for_edict(valueent));
+						value = ftos(etof(valueent));
 				}
 				else
 				{
@@ -219,12 +217,7 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 				value = strcat("target_spawn_helper", value);
 			putentityfieldstring(target_spawn_spawnfunc_field, e, value);
 
-			oldactivator = activator;
-
-			activator = act;
-			SELFCALL(e, e.target_spawn_spawnfunc());
-			SELFCALL_DONE();
-			activator = oldactivator;
+			WITHSELF(e, e.target_spawn_spawnfunc(e));
 
 			// We called an external function, so we have to re-tokenize msg.
 			n = tokenize_console(msg);
@@ -238,71 +231,72 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 	}
 }
 
-void target_spawn_useon(entity e)
-{SELFPARAM();
-	self.target_spawn_activator = activator;
+void target_spawn_useon(entity e, entity this, entity actor, entity trigger)
+{
+	this.target_spawn_activator = actor;
 	target_spawn_edit_entity(
+		this,
 		e,
-		self.message,
-		find(world, targetname, self.killtarget),
-		find(world, targetname, self.target2),
-		find(world, targetname, self.target3),
-		find(world, targetname, self.target4),
-		activator
+		this.message,
+		find(world, targetname, this.killtarget),
+		find(world, targetname, this.target2),
+		find(world, targetname, this.target3),
+		find(world, targetname, this.target4),
+		actor,
+		trigger
 	);
 }
 
-float target_spawn_cancreate()
-{SELFPARAM();
+bool target_spawn_cancreate(entity this)
+{
 	float c;
 	entity e;
 
-	c = self.count;
+	c = this.count;
 	if(c == 0) // no limit?
-		return 1;
+		return true;
 
 	++c; // increase count to not include MYSELF
-	for(e = world; (e = findfloat(e, target_spawn_id, self.target_spawn_id)); --c)
+	for(e = world; (e = findfloat(e, target_spawn_id, this.target_spawn_id)); --c)
 		;
 
 	// if c now is 0, we have AT LEAST the given count (maybe more), so don't spawn any more
 	if(c == 0)
-		return 0;
-	return 1;
+		return false;
+	return true;
 }
 
-void target_spawn_use()
-{SELFPARAM();
-	entity e;
-
-	if(self.target == "")
+void target_spawn_use(entity this, entity actor, entity trigger)
+{
+	if(this.target == "")
 	{
 		// spawn new entity
-		if(!target_spawn_cancreate())
+		if(!target_spawn_cancreate(this))
 			return;
-		e = spawn();
-		target_spawn_useon(e);
-		e.target_spawn_id = self.target_spawn_id;
+		entity e = spawn();
+		e.spawnfunc_checked = true;
+		target_spawn_useon(e, this, actor, trigger);
+		e.target_spawn_id = this.target_spawn_id;
 	}
-	else if(self.target == "*activator")
+	else if(this.target == "*activator")
 	{
 		// edit entity
-		if(activator)
-			target_spawn_useon(activator);
+		if(actor)
+			target_spawn_useon(actor, this, actor, trigger);
 	}
 	else
 	{
 		// edit entity
-		for(e = world; (e = find(e, targetname, self.target)); )
-			target_spawn_useon(e);
+		for(entity e = world; (e = find(e, targetname, this.target)); )
+			target_spawn_useon(e, this, actor, trigger);
 	}
 }
 
-void target_spawn_spawnfirst()
-{SELFPARAM();
-	activator = self.target_spawn_activator;
-	if(self.spawnflags & 2)
-		target_spawn_use();
+void target_spawn_spawnfirst(entity this)
+{
+	entity act = this.target_spawn_activator;
+	if(this.spawnflags & 2)
+		target_spawn_use(this, act, NULL);
 }
 
 void initialize_field_db()
@@ -333,8 +327,8 @@ void initialize_field_db()
 	}
 }
 
-void spawnfunc_target_spawn()
-{SELFPARAM();
+spawnfunc(target_spawn)
+{
 	initialize_field_db();
 	self.use = target_spawn_use;
 	self.message = strzone(strreplace("'", "\"", self.message));