X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftarget%2Fspawn.qc;h=96c266f6cc57315e2436e3f752321b83405a5ab8;hb=692cb758fe8f25fa078bfd5885333ee031885600;hp=f5c54b58eb942f276e6c4503463f193f352d0d15;hpb=5733b1493c8c3fc14830f78122fe388e89f19338;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc
index f5c54b58e..96c266f6c 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,29 +15,28 @@
 //   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;
 float target_spawn_count;
 
 void target_spawn_helper_setmodel()
-{
-	setmodel(self, self.model);
+{SELFPARAM();
+	_setmodel(self, self.model);
 }
 
 void target_spawn_helper_setsize()
-{
+{SELFPARAM();
 	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();
 	float i, n, valuefieldpos;
 	string key, value, valuefield, valueoffset, valueoffsetrandom;
 	entity valueent;
 	vector data, data2;
-	entity oldself;
 	entity oldactivator;
 
 	n = tokenize_console(msg);
@@ -57,7 +55,7 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 			data = stov(db_get(TemporaryDB, strcat("/target_spawn/field/", key)));
 			if(data.y == 0) // undefined field, i.e., invalid type
 			{
-				print("target_spawn: invalid/unknown entity key ", key, " specified, ignored!\n");
+				LOG_INFO("target_spawn: invalid/unknown entity key ", key, " specified, ignored!\n");
 				continue;
 			}
 		}
@@ -152,26 +150,26 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 				}
 				else
 				{
-					print("target_spawn: invalid/unknown variable replacement ", value, " specified, ignored!\n");
+					LOG_INFO("target_spawn: invalid/unknown variable replacement ", value, " specified, ignored!\n");
 					continue;
 				}
 
 				if(valuefield == "")
 				{
 					if(value == "")
-						value = ftos(num_for_edict(valueent));
+						value = ftos(etof(valueent));
 				}
 				else
 				{
 					if(value != "")
 					{
-						print("target_spawn: try to get a field of a non-entity, ignored!\n");
+						LOG_INFO("target_spawn: try to get a field of a non-entity, ignored!\n");
 						continue;
 					}
 					data2 = stov(db_get(TemporaryDB, strcat("/target_spawn/field/", valuefield)));
 					if(data2_y == 0) // undefined field, i.e., invalid type
 					{
-						print("target_spawn: invalid/unknown entity key replacement ", valuefield, " specified, ignored!\n");
+						LOG_INFO("target_spawn: invalid/unknown entity key replacement ", valuefield, " specified, ignored!\n");
 						continue;
 					}
 					value = getentityfieldstring(data2_x, valueent);
@@ -191,7 +189,7 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 							value = vtos(stov(value) + stov(valueoffset));
 							break;
 						default:
-							print("target_spawn: only string, float and vector fields can do calculations, calculation ignored!\n");
+							LOG_INFO("target_spawn: only string, float and vector fields can do calculations, calculation ignored!\n");
 							break;
 					}
 				}
@@ -208,7 +206,7 @@ void target_spawn_edit_entity(entity e, string msg, entity kt, entity t2, entity
 							value = vtos(stov(value) + random() * data2_x * '1 0 0' + random() * data2_y * '0 1 0' + random() * data2_z * '0 0 1');
 							break;
 						default:
-							print("target_spawn: only float and vector fields can do random calculations, calculation ignored!\n");
+							LOG_INFO("target_spawn: only float and vector fields can do random calculations, calculation ignored!\n");
 							break;
 					}
 				}
@@ -220,15 +218,10 @@ 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);
 
-			oldself = self;
 			oldactivator = activator;
 
-			self = e;
 			activator = act;
-
-			self.target_spawn_spawnfunc();
-
-			self = oldself;
+			WITH(entity, self, e, e.target_spawn_spawnfunc(e));
 			activator = oldactivator;
 
 			// We called an external function, so we have to re-tokenize msg.
@@ -244,7 +237,7 @@ 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;
 	target_spawn_edit_entity(
 		e,
@@ -258,7 +251,7 @@ void target_spawn_useon(entity e)
 }
 
 float target_spawn_cancreate()
-{
+{SELFPARAM();
 	float c;
 	entity e;
 
@@ -277,7 +270,7 @@ float target_spawn_cancreate()
 }
 
 void target_spawn_use()
-{
+{SELFPARAM();
 	entity e;
 
 	if(self.target == "")
@@ -286,6 +279,7 @@ void target_spawn_use()
 		if(!target_spawn_cancreate())
 			return;
 		e = spawn();
+		e.spawnfunc_checked = true;
 		target_spawn_useon(e);
 		e.target_spawn_id = self.target_spawn_id;
 	}
@@ -304,7 +298,7 @@ void target_spawn_use()
 }
 
 void target_spawn_spawnfirst()
-{
+{SELFPARAM();
 	activator = self.target_spawn_activator;
 	if(self.spawnflags & 2)
 		target_spawn_use();
@@ -338,7 +332,7 @@ void initialize_field_db()
 	}
 }
 
-void spawnfunc_target_spawn()
+spawnfunc(target_spawn)
 {
 	initialize_field_db();
 	self.use = target_spawn_use;