Use a trace log for the client program version message and remove networked server...

diff --git a/notifications.cfg b/notifications.cfg
index 10f2f8b03049f4ba921c48f5465322b6eeff41a3..61fafdecbb81da8cc99453a2a8cd6e17261c3375 100644 (file)
--- a/notifications.cfg
+++ b/notifications.cfg
@@ -288,7 +288,6 @@ seta notification_INFO_TEAMCHANGE_NOTALLOWED "1" "0 = off, 1 = print to console,
 seta notification_INFO_VERSION_BETA "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_VERSION_OLD "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_VERSION_OUTDATED "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
-seta notification_INFO_WATERMARK "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ACCORDEON_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ACCORDEON_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_ARC_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index ad11dbd296254b5bdbf580109d0b9b3276278d2e..2c63adc4464c3a484477a8daad275cf83b453ebd 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -46,7 +46,7 @@ void CSQC_Init()
        prvm_language = strzone(cvar_string("prvm_language"));
 
 #ifdef WATERMARK
-       LOG_INFOF("^4CSQC Build information: ^1%s", WATERMARK);
+       LOG_TRACEF("^4CSQC Build information: ^1%s", WATERMARK);
 #endif
 
        {

diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index 2c6a16d88f81b90d4b984c43effc5f663f70dcfd..275d25b0ff5a5d2894b83420050cd4daadb0b108 100644 (file)
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -444,8 +444,6 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input !=
     MSG_INFO_NOTIF(VERSION_OLD,                             N_CHATCON,  2, 0, "s1 s2", "",      "",                     _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s"), "")
     MSG_INFO_NOTIF(VERSION_OUTDATED,                        N_CHATCON,  2, 0, "s1 s2", "",      "",                     _("^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!"), "")
 
-    MSG_INFO_NOTIF(WATERMARK,                               N_CONSOLE,  1, 0, "s1", "",         "",                     _("^F3SVQC Build information: ^F4%s"), "")
-
     MSG_INFO_NOTIF(WEAPON_ACCORDEON_MURDER,                 N_CONSOLE,  3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",       "weapontuba",               _("^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s%s"), "")
     MSG_INFO_NOTIF(WEAPON_ACCORDEON_SUICIDE,                N_CONSOLE,  2, 1, "s1 s2loc spree_lost", "s1",                      "weapontuba",               _("^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s%s"), "")
     MSG_INFO_NOTIF(WEAPON_ARC_MURDER,                       N_CONSOLE,  3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1",       "weaponarc",                _("^BG%s%s^K1 was electrocuted by ^BG%s^K1's Arc%s%s"), "")

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 891235def666700cc2a0865d8809d9512a1b43ac..8e55312ba138a9aa50d2c72a035b0910e00725a2 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -69,7 +69,7 @@ void m_init()
        cvar_set("_menu_prvm_language", prvm_language);
 
 #ifdef WATERMARK
-               LOG_INFOF("^4MQC Build information: ^1%s", WATERMARK);
+               LOG_TRACEF("^4MQC Build information: ^1%s", WATERMARK);
 #endif
 
        // list all game dirs (TEST)

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 902172cd0d687753e820df8d2b21e2289db16884..d403f2c111fc58002f86fa98dc6eef9c1429e7fd 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1104,9 +1104,6 @@ void ClientConnect(entity this)
        this.flags |= FL_CLIENT;
        assert(player_count >= 0, player_count = 0);
 
-#ifdef WATERMARK
-       Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_WATERMARK, WATERMARK);
-#endif
        TRANSMUTE(Client, this);
        CS(this).version_nagtime = time + 10 + random() * 10;