X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fspawnpoints.qc;h=022e27608f34016794153f3dc1dbee12f0167b90;hb=06d3f628c5e91ba1dec8016ef082f664e59d2eb6;hp=3a574b28b2bfead37bf5a6eb73380f6f5af382ca;hpb=120ad19fdf46b7096a0f90b940e590f1909ad22c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 3a574b28b..022e27608 100644
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,17 +1,18 @@
 #include "spawnpoints.qh"
-#include "_all.qh"
 
-#include "mutators/mutators_include.qh"
+#include "mutators/all.qh"
 #include "g_world.qh"
 #include "race.qh"
 #include "../common/constants.qh"
 #include "../common/teams.qh"
+#include "../common/triggers/subs.qh"
 #include "../common/util.qh"
-#include "../warpzonelib/util_server.qh"
+#include "../lib/warpzone/common.qh"
+#include "../lib/warpzone/util_server.qh"
 
-float SpawnPoint_Send(entity to, int sf)
-{SELFPARAM();
-	WriteByte(MSG_ENTITY, ENT_CLIENT_SPAWNPOINT);
+bool SpawnPoint_Send(entity this, entity to, int sf)
+{
+	WriteHeader(MSG_ENTITY, ENT_CLIENT_SPAWNPOINT);
 
 	WriteByte(MSG_ENTITY, self.team);
 	WriteShort(MSG_ENTITY, self.origin.x);
@@ -21,15 +22,15 @@ float SpawnPoint_Send(entity to, int sf)
 	return true;
 }
 
-float SpawnEvent_Send(entity to, int sf)
-{SELFPARAM();
+bool SpawnEvent_Send(entity this, entity to, int sf)
+{
 	float send;
 
-	WriteByte(MSG_ENTITY, ENT_CLIENT_SPAWNEVENT);
+	WriteHeader(MSG_ENTITY, ENT_CLIENT_SPAWNEVENT);
 
 	if(autocvar_g_spawn_alloweffects)
 	{
-		WriteByte(MSG_ENTITY, num_for_edict(self.owner));
+		WriteByte(MSG_ENTITY, etof(self.owner));
 		WriteShort(MSG_ENTITY, self.owner.origin.x);
 		WriteShort(MSG_ENTITY, self.owner.origin.y);
 		WriteShort(MSG_ENTITY, self.owner.origin.z);
@@ -45,6 +46,17 @@ float SpawnEvent_Send(entity to, int sf)
 	return send;
 }
 
+.vector spawnpoint_prevorigin;
+void spawnpoint_think()
+{
+	self.nextthink = time + 0.1;
+	if(self.origin != self.spawnpoint_prevorigin)
+	{
+		self.spawnpoint_prevorigin = self.origin;
+		self.SendFlags |= 1;
+	}
+}
+
 void spawnpoint_use()
 {SELFPARAM();
 	if(teamplay)
@@ -90,6 +102,8 @@ void relocate_spawnpoint()
     }
 
     self.use = spawnpoint_use;
+    self.think = spawnpoint_think;
+    self.nextthink = time + 0.5 + random() * 2; // shouldn't need it for a little second
     self.team_saved = self.team;
     if (!self.cnt)
         self.cnt = 1;
@@ -103,9 +117,7 @@ void relocate_spawnpoint()
     {
         // show where spawnpoints point at too
         makevectors(self.angles);
-        entity e;
-        e = spawn();
-        e.classname = "info_player_foo";
+        entity e = new(info_player_foo);
         setorigin(e, self.origin + v_forward * 24);
         setsize(e, '-8 -8 -8', '8 8 8');
         e.solid = SOLID_TRIGGER;
@@ -141,18 +153,18 @@ void relocate_spawnpoint()
 	{ Net_LinkEntity(self, false, 0, SpawnPoint_Send); }
 }
 
-void spawnfunc_info_player_survivor (void)
+spawnfunc(info_player_survivor)
 {
-	spawnfunc_info_player_deathmatch();
+	spawnfunc_info_player_deathmatch(this);
 }
 
-void spawnfunc_info_player_start (void)
+spawnfunc(info_player_start)
 {
-	spawnfunc_info_player_deathmatch();
+	spawnfunc_info_player_deathmatch(this);
 }
 
-void spawnfunc_info_player_deathmatch (void)
-{SELFPARAM();
+spawnfunc(info_player_deathmatch)
+{
 	self.classname = "info_player_deathmatch";
 	relocate_spawnpoint();
 }
@@ -160,47 +172,39 @@ void spawnfunc_info_player_deathmatch (void)
 /*QUAKED spawnfunc_info_player_team1 (1 0 0) (-16 -16 -24) (16 16 24)
 Starting point for a player in team one (Red).
 Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team1()
-{SELFPARAM();
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_1; // red
-	spawnfunc_info_player_deathmatch();
+spawnfunc(info_player_team1)
+{
+	this.team = NUM_TEAM_1; // red
+	spawnfunc_info_player_deathmatch(this);
 }
 
 
 /*QUAKED spawnfunc_info_player_team2 (1 0 0) (-16 -16 -24) (16 16 24)
 Starting point for a player in team two (Blue).
 Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team2()
-{SELFPARAM();
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_2; // blue
-	spawnfunc_info_player_deathmatch();
+spawnfunc(info_player_team2)
+{
+	this.team = NUM_TEAM_2; // blue
+	spawnfunc_info_player_deathmatch(this);
 }
 
 /*QUAKED spawnfunc_info_player_team3 (1 0 0) (-16 -16 -24) (16 16 24)
 Starting point for a player in team three (Yellow).
 Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team3()
-{SELFPARAM();
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_3; // yellow
-	spawnfunc_info_player_deathmatch();
+spawnfunc(info_player_team3)
+{
+	this.team = NUM_TEAM_3; // yellow
+	spawnfunc_info_player_deathmatch(this);
 }
 
 
 /*QUAKED spawnfunc_info_player_team4 (1 0 0) (-16 -16 -24) (16 16 24)
 Starting point for a player in team four (Purple).
 Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team4()
-{SELFPARAM();
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_4; // purple
-	spawnfunc_info_player_deathmatch();
+spawnfunc(info_player_team4)
+{
+	this.team = NUM_TEAM_4; // purple
+	spawnfunc_info_player_deathmatch(this);
 }
 
 // Returns:
@@ -210,7 +214,6 @@ vector Spawn_Score(entity spot, float mindist, float teamcheck)
 {SELFPARAM();
 	float shortest, thisdist;
 	float prio;
-	entity player;
 
 	prio = 0;
 
@@ -235,12 +238,11 @@ vector Spawn_Score(entity spot, float mindist, float teamcheck)
 	}
 
 	shortest = vlen(world.maxs - world.mins);
-	FOR_EACH_PLAYER(player) if (player != self)
-	{
-		thisdist = vlen(player.origin - spot.origin);
+	FOREACH_CLIENT(IS_PLAYER(it) && it != self, LAMBDA(
+		thisdist = vlen(it.origin - spot.origin);
 		if (thisdist < shortest)
 			shortest = thisdist;
-	}
+	));
 	if(shortest > mindist)
 		prio += SPAWN_PRIO_GOOD_DISTANCE;