From 3235a157fc8511c91008c9f5119775685443f338 Mon Sep 17 00:00:00 2001 From: IronClawTrem Date: Fri, 1 Nov 2019 22:27:56 +0000 Subject: allow g_clientUpgradeNotice to be changed manually as g_outdatedClientMessage --- src/game/g_client.c | 15 ++++----------- src/game/g_local.h | 2 +- src/game/g_main.c | 4 ++-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/game/g_client.c b/src/game/g_client.c index 9e86d9f..e488126 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -1625,18 +1625,11 @@ void ClientBegin( int clientNum ) } G_LogPrintf( "ClientBegin: %i\n", clientNum ); - if( g_clientUpgradeNotice.integer ) + if( !Q_stricmp( ent->client->pers.guid, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ) && + g_outdatedClientMessage.string[0] ) { - if( !Q_stricmp( ent->client->pers.guid, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ) ) - { - trap_SendServerCommand( client->ps.clientNum, va( "print \"^3Your client is out of date. Updating your client will allow you to " - "become an admin on servers and download maps much more quickly. Please replace your client executable with a newer client. \n\"" ) ); - - trap_SendServerCommand( client->ps.clientNum, va("print \"^3Some available clients: \n" - "^2TremFusion^7- ^3http://www.tremfusion.net/download/^7\n" - "^2FSM-Trem^7 - ^3http://code.google.com/p/fsm-trem/^7\n" - "^2MGClient^7 - ^3http://releases.mercenariesguild.net/client/^7\n\"" ) ); - } + trap_SendServerCommand( client->ps.clientNum, va( + "print \"%s\n\"", g_outdatedClientMessage.string ) ); } // count current clients and rank for scoreboard diff --git a/src/game/g_local.h b/src/game/g_local.h index 61cc3bf..6aea23d 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -1367,7 +1367,7 @@ extern vmCvar_t g_teamForceBalance; extern vmCvar_t g_banIPs; extern vmCvar_t g_filterBan; extern vmCvar_t g_smoothClients; -extern vmCvar_t g_clientUpgradeNotice; +extern vmCvar_t g_outdatedClientMessage; extern vmCvar_t pmove_fixed; extern vmCvar_t pmove_msec; extern vmCvar_t g_rankings; diff --git a/src/game/g_main.c b/src/game/g_main.c index 856d0d2..b30f8c0 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -112,7 +112,7 @@ vmCvar_t g_teamForceBalance; vmCvar_t g_banIPs; vmCvar_t g_filterBan; vmCvar_t g_smoothClients; -vmCvar_t g_clientUpgradeNotice; +vmCvar_t g_outdatedClientMessage; vmCvar_t pmove_fixed; vmCvar_t pmove_msec; vmCvar_t g_rankings; @@ -349,7 +349,7 @@ static cvarTable_t gameCvarTable[ ] = { &g_newbieNamePrefix, "g_newbieNamePrefix", "Newbie#", CVAR_ARCHIVE, 0, qfalse}, { &g_smoothClients, "g_smoothClients", "1", 0, 0, qfalse}, - { &g_clientUpgradeNotice, "g_clientUpgradeNotice", "1", 0, 0, qfalse}, + { &g_outdatedClientMessage, "g_outdatedClientMessage", "", CVAR_ARCHIVE, 0, qfalse}, { &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO, 0, qfalse}, { &pmove_msec, "pmove_msec", "8", CVAR_SYSTEMINFO, 0, qfalse}, -- cgit