Merge branch 'master' into terencehill/welcome_dialog

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 3bc5cc762f231b2e92f8df7dfdfe4b05e9d55bb1..6111527a1585a868fd889d2fdfe68bd25ba1a5ac 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -766,6 +766,25 @@ void DecodeLevelParms (void)
        self.parm_idlesince = max(self.parm_idlesince, time - sv_maxidle + 60);
 }
 
+void serverinfo_welcomemessage_send()
+{
+       msg_entity = self;
+       WriteByte(MSG_ONE, SVC_TEMPENTITY);
+       WriteByte(MSG_ONE, TE_CSQC_SERVERINFO);
+       WriteString(MSG_ONE, "128.03.192.999"); // FIXME: send the real server ip
+       WriteString(MSG_ONE, autocvar_hostname);
+       WriteString(MSG_ONE, getwelcomemessage());
+       WriteString(MSG_ONE, strcat("128.03.192.999", "/banner"));
+}
+
+void serverinfo_pic_send()
+{
+       msg_entity = self;
+       WriteByte(MSG_ONE, SVC_TEMPENTITY);
+       WriteByte(MSG_ONE, TE_CSQC_SERVERINFO_PIC);
+       WritePicture(MSG_ONE, strcat("128.03.192.999", "/banner"), 3072);
+}
+
 /*
 =============
 ClientKill
@@ -1247,7 +1266,10 @@ 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;