From: Samual Lenks <samual@xonotic.org>
Date: Wed, 1 May 2013 18:51:26 +0000 (-0400)
Subject: Save changes temporarily so I can fix something in master
X-Git-Tag: xonotic-v0.7.0~50^2~9
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=b80f804933b243e66d35d5ae2820dc914979de24;p=xonotic%2Fxonotic-data.pk3dir.git

Save changes temporarily so I can fix something in master
---

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index c0846b742..c45f357f6 100644
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,10 +1,20 @@
 float Spawn_Send(entity to, float sf)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_SPAWNPOINT);
-	WriteByte(MSG_ENTITY, self.team);
-	WriteShort(MSG_ENTITY, self.origin_x);
-	WriteShort(MSG_ENTITY, self.origin_y);
-	WriteShort(MSG_ENTITY, self.origin_z);
+	WriteByte(MSG_ENTITY, sf);
+	
+	if(sf & 1)
+	{
+		WriteByte(MSG_ENTITY, self.team);
+		WriteShort(MSG_ENTITY, self.origin_x);
+		WriteShort(MSG_ENTITY, self.origin_y);
+		WriteShort(MSG_ENTITY, self.origin_z);
+	}
+	if(sf & 2)
+	{
+		WriteLong(MSG_ENTITY, self.last_spawn_time);
+	}
+	
 	return TRUE;
 }
 
@@ -16,6 +26,9 @@ void spawnpoint_use()
 		self.team = activator.team;
 		some_spawn_has_been_used = 1;
 	}
+	print("spawnpoint was used!\n");
+	self.last_spawn_time = time;
+	Spawn_Send_Think;
 }
 
 void relocate_spawnpoint()