]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/welcome_dialog
authorterencehill <piuntn@gmail.com>
Sat, 7 Mar 2015 18:43:33 +0000 (19:43 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 7 Mar 2015 18:43:33 +0000 (19:43 +0100)
1  2 
qcsrc/server/cl_client.qc

index 8f5c48e4658aa6d528cb3ddd08cd424c45bf766e,3bc5cc762f231b2e92f8df7dfdfe4b05e9d55bb1..6111527a1585a868fd889d2fdfe68bd25ba1a5ac
@@@ -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);
  }
  /*