From: terencehill <piuntn@gmail.com>
Date: Sat, 7 Mar 2015 18:43:33 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/welcome_dialog
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad1ab138876ec34389508f189bcce3778fdd5c1a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/welcome_dialog
---

ad1ab138876ec34389508f189bcce3778fdd5c1a
diff --cc qcsrc/server/cl_client.qc
index 8f5c48e46,3bc5cc762..6111527a1
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1266,11 -1247,15 +1266,18 @@@ void ClientConnect (void
  	self.model_randomizer = random();
  
  	if(IS_REAL_CLIENT(self))
 +	{
 +		serverinfo_welcomemessage_send();
  		sv_notice_join();
 +	}
  
+ 	for (entity e = world; (e = findfloat(e, init_for_player_needed, 1)); ) {
+ 		entity oldself = self;
+ 		self = e;
+ 		e.init_for_player(oldself);
+ 		self = oldself;
+ 	}
+ 
  	MUTATOR_CALLHOOK(ClientConnect);
  }
  /*