From afd44af43b0a8a324f40e777843a0b289b50bfb8 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 26 Mar 2022 15:27:39 +0100 Subject: [PATCH] Make it "Gametype:" like another existing translatable string in the Serverinfo dialog. Rename TE_CSQC_SERVERINFO to TE_CSQC_SERVERWELCOME to remove ambiguity --- qcsrc/client/main.qc | 4 ++-- qcsrc/common/net_linked.qh | 2 +- qcsrc/server/client.qc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 67b259c18..afebfd77e 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1286,7 +1286,7 @@ NET_HANDLE(TE_CSQC_WEAPONCOMPLAIN, bool isNew) } } -NET_HANDLE(TE_CSQC_SERVERINFO, bool isNew) +NET_HANDLE(TE_CSQC_SERVERWELCOME, bool isNew) { bool campaign = ReadByte(); if (campaign) @@ -1317,7 +1317,7 @@ NET_HANDLE(TE_CSQC_SERVERINFO, bool isNew) string msg = ""; msg = strcat(msg, ver); - msg = strcat(msg, "^8\n\n", sprintf(_("Game type: ^1%s"), MapInfo_Type_ToText(gametype)), "^8\n"); + msg = strcat(msg, "^8\n\n", strcat(_("Gametype:"), " ^1", MapInfo_Type_ToText(gametype)), "^8\n"); if(modifications != "") msg = strcat(msg, "^8\n", _("Active modifications:"), " ^3", modifications, "^8\n"); if (cache_mutatormsg != "") diff --git a/qcsrc/common/net_linked.qh b/qcsrc/common/net_linked.qh index 0b5923f17..e1586c203 100644 --- a/qcsrc/common/net_linked.qh +++ b/qcsrc/common/net_linked.qh @@ -5,7 +5,7 @@ REGISTER_NET_TEMP(TE_CSQC_RACE) REGISTER_NET_TEMP(TE_CSQC_TEAMNAGGER) REGISTER_NET_TEMP(TE_CSQC_PINGPLREPORT) REGISTER_NET_TEMP(TE_CSQC_WEAPONCOMPLAIN) -REGISTER_NET_TEMP(TE_CSQC_SERVERINFO) +REGISTER_NET_TEMP(TE_CSQC_SERVERWELCOME) REGISTER_NET_TEMP(TE_CSQC_VEHICLESETUP) const int RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index bafcb5266..68c19f638 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -1036,7 +1036,7 @@ string GetClientVersionMessage(entity this) void SendWelcomemessage(entity this, bool force_centerprint) { msg_entity = this; - WriteHeader(MSG_ONE, TE_CSQC_SERVERINFO); + WriteHeader(MSG_ONE, TE_CSQC_SERVERWELCOME); WriteByte(MSG_ONE, boolean(autocvar_g_campaign)); if (boolean(autocvar_g_campaign)) { -- 2.39.2