Add MOTD/Server Website feature fix

The client side implementation exists, but server side seemed to be broken, so let's reimplement it ourselves

Author: Vauff

cfg/cs2fixes/cs2fixes.cfg

@@ -1,7 +1,7 @@
 // Feature cvars
 cs2f_commands_enable			0		// Whether to enable chat commands
 cs2f_admin_commands_enable		0		// Whether to enable admin chat commands
-cs2f_admin_immunity             0       // Mode for which admin immunity system targetting allows: 0 - strictly lower, 1 - equal to or lower, 2 - ignore immunity levels
+cs2f_admin_immunity				0		// Mode for which admin immunity system targetting allows: 0 - strictly lower, 1 - equal to or lower, 2 - ignore immunity levels
 cs2f_weapons_enable 			0		// Whether to enable weapon commands
 cs2f_stopsound_enable 			0		// Whether to enable stopsound
 cs2f_noblock_enable 			0		// Whether to use player noblock, which sets debris collision on every player
@@ -26,10 +26,10 @@ cs2f_fix_game_bans				0		// Whether to fix CS2 game bans spreading to all new jo
 cs2f_free_armor					0		// Whether kevlar (1+) and/or helmet (2) are given automatically
 
 cs2f_beacon_particle			"particles/cs2fixes/admin_beacon.vpcf" // .vpcf file to be precached and used for player beacon
-
+cs2f_motd_url					""		// Server MOTD URL, shows up as a "Server Website" button in scoreboard
 cs2f_delay_auth_fail_kick		0		// How long in seconds to delay kicking players when their Steam authentication fails, use with sv_steamauth_enforce 0
 
-//Screen Shake settings
+// Screen Shake settings
 cs2f_noshake_enable				0		// Whether to enable noshake command
 cs2f_maximum_shake_amplitude	-1		// Shaking Amplitude bigger than this will be clamped (0-16.0), -1 = no clamp
 
@@ -131,16 +131,16 @@ cs2f_leader_actions_ct_only		1		// Whether to allow leader actions (like !beacon
 cs2f_leader_marker_ct_only		1		// Whether to have zombie leaders' player_pings spawn in particle markers or not
 cs2f_leader_mute_player_pings	1		// Whether to mute player pings made by non-leaders
 cs2f_leader_model_path			""		// Path to player model to be used for leaders
-cs2f_leader_defend_particle		"particles/cs2fixes/leader_defend_mark.vpcf"      // Path to defend particle to be used with c_defend
-cs2f_leader_mark_particle		"particles/cs2fixes/leader_defend_mark.vpcf"      // Path to particle to be used when a ct leader using player_ping
-cs2f_leader_can_target_players	0       // Whether a leader can target other players with leader commands (not including c_leader)
-cs2f_leader_vote_multiple		1       // If 1, players can vote up to cs2f_max_leaders leaders. If 0, they may vote for a single leader
+cs2f_leader_defend_particle		"particles/cs2fixes/leader_defend_mark.vpcf"		// Path to defend particle to be used with c_defend
+cs2f_leader_mark_particle		"particles/cs2fixes/leader_defend_mark.vpcf"		// Path to particle to be used when a ct leader using player_ping
+cs2f_leader_can_target_players	0		// Whether a leader can target other players with leader commands (not including c_leader)
+cs2f_leader_vote_multiple		1		// If 1, players can vote up to cs2f_max_leaders leaders. If 0, they may vote for a single leader
 cs2f_leader_extra_score			20000	// Extra score to give a leader to affect their position on the scoreboard
-cs2f_leader_max_leaders			3       // Max amount of leaders set via c_vl or a leader using c_leader (doesn't impact admins)
-cs2f_leader_max_markers			6       // Max amount of markers set by leaders (doesn't impact admins)
-cs2f_leader_max_glows			3       // Max amount of glows set by leaders (doesn't impact admins)
-cs2f_leader_max_tracers			3       // Max amount of tracers set by leaders (doesn't impact admins)
-cs2f_leader_max_beacons			3       // Max amount of beacons set by leaders (doesn't impact admins)
+cs2f_leader_max_leaders			3		// Max amount of leaders set via c_vl or a leader using c_leader (doesn't impact admins)
+cs2f_leader_max_markers			6		// Max amount of markers set by leaders (doesn't impact admins)
+cs2f_leader_max_glows			3		// Max amount of glows set by leaders (doesn't impact admins)
+cs2f_leader_max_tracers			3		// Max amount of tracers set by leaders (doesn't impact admins)
+cs2f_leader_max_beacons			3		// Max amount of beacons set by leaders (doesn't impact admins)
 
 // Idle Kick Settings
 cs2f_idle_kick_time				0.0		// Amount of minutes before kicking idle players. 0 to disable afk kicking.

src/cs2fixes.cpp

@@ -599,6 +599,8 @@ void CS2Fixes::Hook_DispatchConCommand(ConCommandRef cmdHandle, const CCommandCo
 	RETURN_META(MRES_IGNORED);
 }
 
+CConVar<CUtlString> g_cvarMotdUrl("cs2f_motd_url", FCVAR_NONE, "Server MOTD URL, shows up as a \"Server Website\" button in scoreboard", "");
+
 void CS2Fixes::Hook_StartupServer(const GameSessionConfiguration_t& config, ISource2WorldSession* pSession, const char* pszMapName)
 {
 	g_pEntitySystem = GameEntitySystem();
@@ -618,8 +620,18 @@ void CS2Fixes::Hook_StartupServer(const GameSessionConfiguration_t& config, ISou
 
 	g_pPanoramaVoteHandler->Reset();
 	g_pVoteManager->VoteManager_Init();
-
 	g_pIdleSystem->Reset();
+
+	INetworkStringTable* pInfoPanelTable = g_pNetworkStringTableServer->FindTable("InfoPanel");
+
+	if (pInfoPanelTable && V_strcmp(g_cvarMotdUrl.Get(), ""))
+	{
+		SetStringUserDataRequest_t pUserData;
+		pUserData.m_pRawData = (void*)g_cvarMotdUrl.Get().Get();
+		pUserData.m_cbDataSize = g_cvarMotdUrl.Get().Length() + 1;
+
+		pInfoPanelTable->AddString(true, "motd", &pUserData);
+	}
 }
 
 class CGamePlayerEquip;

src/entwatch.h

@@ -178,7 +178,7 @@ struct EWItemInstance : EWItem /* Current instance of defined items */
 		sClantag(""),
 		bHasThisClantag(false),
 		iTeamNum(CS_TEAM_NONE),
-		bShouldGlow(false) {};
+		bShouldGlow(false){};
 	bool RegisterHandler(CBaseEntity* pEnt, int iHandlerTemplateNum);
 	bool RemoveHandler(CBaseEntity* pEnt);
 	int FindHandlerByEntIndex(int indexToFind);