Commit: 37dc3489e51284193fb9be92cba092f3d7ab11e5 - zatspg-release (hg)

This is a fork of Zandronum for TSPG.

Commit MetaInfo

• Revisión: 37dc3489e51284193fb9be92cba092f3d7ab11e5 (tree)
• Tiempo: 2018-03-17 01:41:51
• Autor: Sean Baggaley <sean@csnx...>
• Commiter: Sean Baggaley

Log Message

Added various branding CVars
- tspg_branding_hostnameprefix - this value will be prepended to sv_hostname whenever it is changed e.g. "[TSPG]" (space between prefix and name is added automatically)
- tspg_branding_name - name of the server chain e.g. "The Sentinel's Playground"
- tspg_branding_short - short name of the chain e.g. "TSPG"
- tspg_branding_url - link to the chain's website e.g. "allfearthesentinel.net"

Cambiar Resumen

• modified: src/c_cvars.h
• modified: src/sv_main.cpp
• modified: src/sv_master.cpp
• modified: src/version.h

Diferencia incremental

diff -r 637a1b77fcf7 -r 37dc3489e512 src/c_cvars.h
--- a/src/c_cvars.h	Fri Mar 16 07:40:18 2018 +0000
+++ b/src/c_cvars.h	Fri Mar 16 16:41:51 2018 +0000
@@ -81,6 +81,13 @@
 	CVAR_UNSYNCED_USERINFO = 524288,
 };
 
+// [TSPG] reduces need of wrapping everything we want to block in a macro
+#if defined( SERVER_ONLY ) && defined( SERVER_BLACKLIST )
+#define TSPG_NOSET CVAR_NOSET
+#else
+#define TSPG_NOSET 0
+#endif
+
 union UCVarValue
 {
 	bool Bool;

diff -r 637a1b77fcf7 -r 37dc3489e512 src/sv_main.cpp
--- a/src/sv_main.cpp	Fri Mar 16 07:40:18 2018 +0000
+++ b/src/sv_main.cpp	Fri Mar 16 16:41:51 2018 +0000
@@ -290,6 +290,10 @@
 CVAR( Bool, sv_forcelogintojoin, false, CVAR_ARCHIVE|CVAR_NOSETBYACS )
 CVAR( Bool, sv_useticbuffer, true, CVAR_ARCHIVE|CVAR_NOSETBYACS|CVAR_DEBUGONLY )
 
+CVAR( String, tspg_branding_name, "The Sentinel's Playground", CVAR_SERVERINFO|TSPG_NOSET );
+CVAR( String, tspg_branding_short, "TSPG", CVAR_SERVERINFO|TSPG_NOSET );
+CVAR( String, tspg_branding_url, "https://allfearthesentinel.net", CVAR_SERVERINFO|TSPG_NOSET );
+
 // [TSPG]
 #if defined( SERVER_ONLY ) && defined( SERVER_BLACKLIST )
 CUSTOM_CVAR( String, sv_adminlistfile, "adminlist.txt", CVAR_ARCHIVE|CVAR_NOSETBYACS|CVAR_NOSET )
@@ -1354,15 +1358,18 @@
 
 	// [TSPG]
 	const char *owner = Args->CheckValue("-owner");
+	const char *brandingName = tspg_branding_name.GetGenericRep(CVAR_String).String;
+	const char *brandingShort = tspg_branding_short.GetGenericRep(CVAR_String).String;
+	const char *brandingUrl = tspg_branding_url.GetGenericRep(CVAR_String).String;
 
 	// Send welcome message.
 	SERVER_PrintfPlayer( g_lCurrentClient, "\n" );
-	SERVER_PrintfPlayer( g_lCurrentClient, "\\cnWelcome to \\cjThe Sentinel's Playground\\cn!\n", DOTVERSIONSTR );
+	SERVER_PrintfPlayer( g_lCurrentClient, "\\cnWelcome to \\cj%s\\cn!\n", brandingName );
 	SERVER_PrintfPlayer( g_lCurrentClient, "\\cnThis server is running \\cj%s %s (TSPGv%s)\n", GAMENAME, GetVersionStringRev(), TSPG_VERSION_STR);
 	SERVER_PrintfPlayer( g_lCurrentClient, "\\cn Compiled on \\cj%s\\cn at \\cj%s\n", __DATE__, __TIME__ );
 	if (owner) SERVER_PrintfPlayer(g_lCurrentClient, "\\cnThis server was started by \\cj%s\\cn at \\cj%s", owner, g_pszStartupTime);
-	SERVER_PrintfPlayer(g_lCurrentClient, "\\cnIf you wish to host your own server on TSPG, visit \\cjallfearthesentinel.net\\cn!\n", owner);
-	SERVER_PrintfPlayer(g_lCurrentClient, "\n\\cfServer information:\n", owner);
+	SERVER_PrintfPlayer(g_lCurrentClient, "\\cnIf you wish to host your own server on %s, visit \\cj%s\\cn!\n", brandingShort, brandingUrl);
+	SERVER_PrintfPlayer(g_lCurrentClient, "\n\\cfServer information:\n");
 
 	SERVER_PrintfPlayer(PRINT_HIGH, g_lCurrentClient, "\\cg %s\n", sv_hostname.GetGenericRep(CVAR_String).String);
 	SERVER_PrintfPlayer(PRINT_HIGH, g_lCurrentClient, " dmflags=%lu dmflags2=%lu dmflags3=%lu compatflags=%lu compatflags2=%lu\n", (LONG)dmflags, (LONG)dmflags2, (LONG)zadmflags, (LONG)compatflags, (LONG)compatflags2);

diff -r 637a1b77fcf7 -r 37dc3489e512 src/sv_master.cpp
--- a/src/sv_master.cpp	Fri Mar 16 07:40:18 2018 +0000
+++ b/src/sv_master.cpp	Fri Mar 16 16:41:51 2018 +0000
@@ -685,9 +685,25 @@
 	SERVERCONSOLE_UpdateBroadcasting( );
 }
 
+CVAR(String, tspg_branding_hostnameprefix, "", CVAR_SERVERINFO|TSPG_NOSET);
+
 // Name of this server on launchers.
 CUSTOM_CVAR( String, sv_hostname, "Unnamed " GAMENAME " server", CVAR_ARCHIVE|CVAR_NOSETBYACS )
 {
+	static bool tspgPrefixLock = false;
+	if (tspgPrefixLock)
+	{
+		tspgPrefixLock = false;
+		return;
+	}
+
+	tspgPrefixLock = true;
+	const char *val = sv_hostname.GetGenericRep(CVAR_String).String;
+	const char *pre = tspg_branding_hostnameprefix.GetGenericRep(CVAR_String).String;
+	FString newval;
+	newval.Format("%s %s", pre, val);
+	self = newval.GetChars();
+
 	SERVERCONSOLE_UpdateTitleString( (const char *)self );
 }
 

diff -r 637a1b77fcf7 -r 37dc3489e512 src/version.h
--- a/src/version.h	Fri Mar 16 07:40:18 2018 +0000
+++ b/src/version.h	Fri Mar 16 16:41:51 2018 +0000
@@ -140,7 +140,7 @@
 // The maximum length of one save game description for the menus.
 #define SAVESTRINGSIZE		24
 
-#define TSPG_VERSION 5
+#define TSPG_VERSION 6
 
 #ifdef TSPG_DEBUG
 #define TSPG_VERSION_STR SAVEVERSTRINGIFY(TSPG_VERSION) "-dbg"