X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmain.qc;h=2b29422b8969362356b6a552106158c9b881d0e7;hb=133cba402a7d11565c47dc42412b2ac0b9b8f121;hp=fb7df4ade9589d6bbbe80f77007c18947e8bcea8;hpb=d24e46b65c1fe73fae4cf8034f4e7f318a17053a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/main.qc b/qcsrc/server/main.qc
index fb7df4ade..2b29422b8 100644
--- a/qcsrc/server/main.qc
+++ b/qcsrc/server/main.qc
@@ -26,6 +26,40 @@
 #include <server/weapons/csqcprojectile.qh>
 #include <server/world.qh>
 
+void dropclient_do(entity this)
+{
+	if (this.owner)
+		dropclient(this.owner);
+	delete(this);
+}
+/**
+ * Schedules dropclient for a player and returns true;
+ * if dropclient is already scheduled (for that player) it does nothing and returns false.
+ *
+ * NOTE: this function exists only to allow sending a message to the kicked player with
+ * Send_Notification, which doesn't work if called together with dropclient
+ */
+bool dropclient_schedule(entity this)
+{
+	bool scheduled = false;
+	FOREACH_ENTITY_CLASS("dropclient_handler", true,
+	{
+		if(it.owner == this)
+		{
+			scheduled = true;
+			break; // can't use return here, compiler shows a warning
+		}
+	});
+	if (scheduled)
+		return false;
+
+	entity e = new_pure(dropclient_handler);
+	setthink(e, dropclient_do);
+	e.owner = this;
+	e.nextthink = time + 0.1;
+	return true;
+}
+
 void CreatureFrame_hotliquids(entity this)
 {
 	if (this.contents_damagetime >= time)
@@ -297,8 +331,8 @@ void StartFrame()
 	CreatureFrame_All();
 	CheckRules_World();
 
-	if (warmup_stage && !game_stopped && warmup_limit > 0 && time >= warmup_limit) {
-		ReadyRestart();
+	if (warmup_stage && !game_stopped && warmup_limit > 0 && time - game_starttime >= warmup_limit) {
+		ReadyRestart(true);
 		return;
 	}
 
@@ -381,7 +415,7 @@ string GetField_fullspawndata(entity e, string f, ...)
 
 	if (!e.fullspawndata)
 	{
-		LOG_WARNF("^1EDICT %s (classname %s) has no fullspawndata, engine lacks support?", ftos(num_for_edict(e)), e.classname);
+		//LOG_WARNF("^1EDICT %s (classname %s) has no fullspawndata, engine lacks support?", ftos(num_for_edict(e)), e.classname);
 		return v;
 	}