Added MessageBox call for when running -forcep2mmload and its a unsupported game.

OrsellGit · OrsellGit · commit ff549aa5c0c8 · 2025-03-18T14:59:42.000-07:00
diff --git a/p2mm.cpp b/p2mm.cpp
@@ -14,6 +14,8 @@
 
 #include "minhook/include/MinHook.h"
 
+#include <Windows.h>
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
@@ -111,6 +113,8 @@ static const char* forbiddenClientCommands[] =
 //---------------------------------------------------------------------------------
 CP2MMServerPlugin::CP2MMServerPlugin()
 {
+	this->m_hWnd = nullptr; // Game window handle
+	
 	// Store game vars
 	this->m_bSeenFirstRunPrompt = false;	// Flag is set true after CallFirstRunPrompt() is called in VScript.
 	this->m_bFirstMapRan = true;			// Checks if the game ran for the first time.
@@ -160,6 +164,10 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface
 
 	P2MMLog(0, false, "Loading plugin...");
 
+	this->m_hWnd = FindWindow("Valve001", nullptr);
+	if (!this->m_hWnd)
+		P2MMLog(1, false, "Failed to find game window Valve001!");
+
 	// Determine which Portal 2 branch game we are running and if its supported.
 	bool unsupportedGame = false;
 	const char* gameMainDir = GetGameMainDir();
@@ -221,71 +229,74 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface
 		return false;
 	}
 	if (unsupportedGame && CommandLine()->FindParm("-forcep2mmload"))
+	{
+		MessageBox(this->m_hWnd, "P2:MM is being run with a unsupported Source Engine/Portal 2 branch game! Proceed with caution as crashes and bugs could occur!", "Unsupported P2:MM Game", MB_OK | MB_ICONEXCLAMATION);
 		P2MMLog(1, false, "P2:MM is being run with a unsupported Source Engine/Portal 2 branch game! Proceed with caution as crashes and bugs could occur!");
+	}
 
 	P2MMLog(0, true, "Connecting tier libraries...");
 	ConnectTier1Libraries(&interfaceFactory, 1);
 	ConnectTier2Libraries(&interfaceFactory, 1);
 
 	// Make sure that all the interfaces needed are loaded and useable
 	P2MMLog(0, true, "Loading interfaces...");
-	engineServer = (IVEngineServer*)interfaceFactory(INTERFACEVERSION_VENGINESERVER, 0);
+	engineServer = static_cast<IVEngineServer*>(interfaceFactory(INTERFACEVERSION_VENGINESERVER, 0));
 	if (!engineServer)
 	{
 		P2MMLog(1, false, "Unable to load engineServer!");
 		this->m_bNoUnload = true;
 		return false;
 	}
 
-	engineClient = (IVEngineClient*)interfaceFactory(VENGINE_CLIENT_INTERFACE_VERSION, 0);
+	engineClient = static_cast<IVEngineClient*>(interfaceFactory(VENGINE_CLIENT_INTERFACE_VERSION, 0));
 	if (!engineClient)
 	{
 		P2MMLog(1, false, "Unable to load engineClient!");
 		this->m_bNoUnload = true;
 		return false;
 	}
 
-	g_pPlayerInfoManager = (IPlayerInfoManager*)gameServerFactory(INTERFACEVERSION_PLAYERINFOMANAGER, 0);
+	g_pPlayerInfoManager = static_cast<IPlayerInfoManager*>(gameServerFactory(INTERFACEVERSION_PLAYERINFOMANAGER, 0));
 	if (!g_pPlayerInfoManager)
 	{
 		P2MMLog(1, false, "Unable to load g_pPlayerInfoManager!");
 		this->m_bNoUnload = true;
 		return false;
 	}
 
-	g_pScriptVM = (IScriptVM*)interfaceFactory(VSCRIPT_INTERFACE_VERSION, 0);
+	g_pScriptVM = static_cast<IScriptVM*>(interfaceFactory(VSCRIPT_INTERFACE_VERSION, 0));
 	if (!g_pScriptVM)
 	{
 		P2MMLog(1, false, "Unable to load g_pScriptVM!");
 		this->m_bNoUnload = true;
 		return false;
 	}
 
-	g_pServerTools = (IServerTools*)gameServerFactory(VSERVERTOOLS_INTERFACE_VERSION, 0);
+	g_pServerTools = static_cast<IServerTools*>(gameServerFactory(VSERVERTOOLS_INTERFACE_VERSION, 0));
 	if (!g_pServerTools)
 	{
 		P2MMLog(1, false, "Unable to load g_pServerTools!");
 		this->m_bNoUnload = true;
 		return false;
 	}
 
-	g_pGameEventManager = (IGameEventManager2*)interfaceFactory(INTERFACEVERSION_GAMEEVENTSMANAGER2, 0);
+	g_pGameEventManager = static_cast<IGameEventManager2*>(interfaceFactory(INTERFACEVERSION_GAMEEVENTSMANAGER2, 0));
 	if (!g_pGameEventManager)
 	{
 		P2MMLog(1, false, "Unable to load g_pGameEventManager!");
 		this->m_bNoUnload = true;
 		return false;
 	}
 
-	g_pPluginHelpers = (IServerPluginHelpers*)interfaceFactory(INTERFACEVERSION_ISERVERPLUGINHELPERS, 0);
+	g_pPluginHelpers = static_cast<IServerPluginHelpers*>(interfaceFactory(INTERFACEVERSION_ISERVERPLUGINHELPERS, 0));
 	if (!g_pPluginHelpers)
 	{
 		P2MMLog(1, false, "Unable to load g_pPluginHelpers!");
 		this->m_bNoUnload = true;
 		return false;
 	}
 
-	g_pFileSystem = (IFileSystem*)interfaceFactory(FILESYSTEM_INTERFACE_VERSION, 0);
+	g_pFileSystem = static_cast<IFileSystem*>(interfaceFactory(FILESYSTEM_INTERFACE_VERSION, 0));
 	if (!g_pFileSystem)
 	{
 		P2MMLog(1, false, "Unable to load g_pFileSystem!");
@@ -540,8 +551,8 @@ void CP2MMServerPlugin::LevelInit(char const* pMapName)
 
 	if (!g_P2MMServerPlugin.m_bSeenFirstRunPrompt) return;
 
-	std::string changemapstr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
-	g_pDiscordIntegration->SendWebHookEmbed("Server", changemapstr, EMBED_COLOR_SERVER, false);
+	std::string changeMapStr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
+	g_pDiscordIntegration->SendWebHookEmbed("Server", changeMapStr, EMBED_COLOR_SERVER, false);
 
 	// Update Discord RPC to update current map information.
 	g_pDiscordIntegration->UpdateDiscordRPC();
@@ -552,7 +563,7 @@ void CP2MMServerPlugin::LevelInit(char const* pMapName)
 //---------------------------------------------------------------------------------
 PLUGIN_RESULT CP2MMServerPlugin::ClientCommand(edict_t* pEntity, const CCommand& args)
 {
-	// Check if its a valid player edict.
+	// Check if it's a valid player edict.
 	if (!pEntity || pEntity->IsFree())
 		return PLUGIN_CONTINUE;
 
@@ -619,8 +630,8 @@ PLUGIN_RESULT CP2MMServerPlugin::ClientCommand(edict_t* pEntity, const CCommand&
 //---------------------------------------------------------------------------------
 void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 {
-	bool spewinfo = p2mm_spewgameeventinfo.GetBool();
-	if (spewinfo)
+	bool spewInfo = p2mm_spewgameeventinfo.GetBool();
+	if (spewInfo)
 	{
 		P2MMLog(0, true, "Game Event Fired: %s", event->GetName());
 		P2MMLog(0, true, "VScript VM Working?: %s", (g_pScriptVM) ? "Working" : "Not Working!");
@@ -635,7 +646,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 	*/
 	if (FStrEq(event->GetName(), "portal_player_ping"))
 	{
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		float ping_x = event->GetFloat("ping_x");
 		float ping_y = event->GetFloat("ping_y");
 		float ping_z = event->GetFloat("ping_z");
@@ -649,7 +660,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				g_pScriptVM->Call<short, float, float, float, int>(ge_func, nullptr, false, nullptr, userid, ping_x, ping_y, ping_z, entindex);
 		}
 
-		if (spewinfo)
+		if (spewInfo)
 		{
 			P2MMLog(0, true, "userid: %i", userid);
 			P2MMLog(0, true, "ping_x: %f", ping_x);
@@ -665,9 +676,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		"userid"	"short"		// user ID on server
 		"portal2"	"bool"		// false for portal1 (blue)
 	*/
-	else if (FStrEq(event->GetName(), "portal_player_portaled"))
+	if (FStrEq(event->GetName(), "portal_player_portaled"))
 	{
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		bool portal2 = event->GetString("text");
 		int entindex = UserIDToPlayerIndex(userid);
 
@@ -679,7 +690,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				g_pScriptVM->Call<short, bool, int>(ge_func, nullptr, false, nullptr, userid, portal2, entindex);
 		}
 
-		if (spewinfo)
+		if (spewInfo)
 		{
 			P2MMLog(0, true, "userid: %i", userid);
 			P2MMLog(0, true, "portal2: %s", portal2 ? "true" : "false");
@@ -689,7 +700,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		return;
 	}
 	// Event called when a turret hits another turret, "turret_hit_turret" returns nothing.
-	else if (FStrEq(event->GetName(), "turret_hit_turret"))
+	if (FStrEq(event->GetName(), "turret_hit_turret"))
 	{
 		if (g_pScriptVM)
 		{
@@ -702,7 +713,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		return;
 	}
 	// Event called when a camera is detached from a wall, "security_camera_detached" returns nothing.
-	else if (FStrEq(event->GetName(), "security_camera_detached"))
+	if (FStrEq(event->GetName(), "security_camera_detached"))
 	{
 		if (g_pScriptVM)
 		{
@@ -718,9 +729,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 	/*
 		"userid"	"short"		// user ID on server
 	*/
-	else if (FStrEq(event->GetName(), "player_landed"))
+	if (FStrEq(event->GetName(), "player_landed"))
 	{
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		int entindex = UserIDToPlayerIndex(userid);
 
 		if (g_pScriptVM)
@@ -734,7 +745,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		return;
 	}
 	// Event called when a Blue/Atlas spawns, "player_spawn_blue" returns nothing.
-	else if (FStrEq(event->GetName(), "player_spawn_blue"))
+	if (FStrEq(event->GetName(), "player_spawn_blue"))
 	{
 		if (g_pScriptVM)
 		{
@@ -747,7 +758,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		return;
 	}
 	// Event called when a Red/Orange/PBody spawns, "player_spawn_orange" returns nothing.
-	else if (FStrEq(event->GetName(), "player_spawn_orange"))
+	if (FStrEq(event->GetName(), "player_spawn_orange"))
 	{
 		if (g_pScriptVM)
 		{
@@ -764,9 +775,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		"userid"	"short"   	// user ID who died
 		"attacker"	"short"	 	// user ID who killed
 	*/
-	else if (FStrEq(event->GetName(), "player_death"))
+	if (FStrEq(event->GetName(), "player_death"))
 	{
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		short attacker = event->GetInt("attacker");
 		int entindex = UserIDToPlayerIndex(userid);
 
@@ -790,7 +801,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				g_pScriptVM->Call<short, short, int>(ge_func, nullptr, false, nullptr, userid, attacker, entindex);
 		}
 
-		if (spewinfo)
+		if (spewInfo)
 		{
 			P2MMLog(0, true, "userid: %i", userid);
 			P2MMLog(0, true, "attacker: %i", attacker);
@@ -803,9 +814,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 	/*
 		"userid"	"short"		// user ID on server
 	*/
-	else if (FStrEq(event->GetName(), "player_spawn"))
+	if (FStrEq(event->GetName(), "player_spawn"))
 	{
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		int entindex = UserIDToPlayerIndex(userid);
 
 		if (g_pScriptVM)
@@ -816,7 +827,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				g_pScriptVM->Call<short, int>(ge_func, nullptr, false, nullptr, userid, entindex);
 		}
 
-		if (spewinfo)
+		if (spewInfo)
 		{
 			P2MMLog(0, true, "userid: %i", userid);
 			P2MMLog(0, true, "entindex: %i", entindex);
@@ -838,11 +849,11 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		"bot"		"bool"		// player is a bot
 	}
 	*/
-	else if (FStrEq(event->GetName(), "player_connect"))
+	if (FStrEq(event->GetName(), "player_connect"))
 	{
 		const char* name = event->GetString("name");
 		int index = event->GetInt("index");
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		const char* xuid = std::to_string(event->GetUint64("xuid")).c_str();
 		const char* networkid = event->GetString("networkid");
 		const char* address = event->GetString("address");
@@ -860,7 +871,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 			}
 		}
 
-		if (spewinfo)
+		if (spewInfo)
 		{
 			P2MMLog(0, true, "name: %s", name);
 			P2MMLog(0, true, "index: %i", index);
@@ -883,11 +894,11 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		"networkid"	"string"	// player network (i.e steam) id
 		"bot"		"bool"		// true if player is a AI bot
 	*/
-	else if (FStrEq(event->GetName(), "player_info"))
+	if (FStrEq(event->GetName(), "player_info"))
 	{
 		const char* name = event->GetString("name");
 		int index = event->GetInt("index");
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		const char* networkid = event->GetString("networkid");
 		const char* address = event->GetString("address");
 		bool bot = event->GetBool("bot");
@@ -901,7 +912,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				g_pScriptVM->Call<const char*, int, short, const char*, const char*, bool, int>(ge_func, nullptr, false, nullptr, name, index, userid, networkid, address, bot, entindex);
 		}
 
-		if (spewinfo)
+		if (spewInfo)
 		{
 			P2MMLog(0, true, "name: %s", name);
 			P2MMLog(0, true, "index: %i", index);
@@ -919,9 +930,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 		"userid"	"short"		// user ID on server
 		"text"		"string"	// the say text
 	*/
-	else if (FStrEq(event->GetName(), "player_say"))
+	if (FStrEq(event->GetName(), "player_say"))
 	{
-		short userid = event->GetInt("userid");
+		int userid = event->GetInt("userid");
 		const char* text = event->GetString("text");
 		int entindex = UserIDToPlayerIndex(userid);
 
@@ -963,7 +974,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				g_pScriptVM->Call<short, const char*, int>(ge_func, nullptr, false, nullptr, userid, text, entindex);
 		}
 
-		if (spewinfo)
+		if (spewInfo)
 		{
 			P2MMLog(0, true, "userid: %i", userid);
 			P2MMLog(0, true, "text: %s", text);
@@ -972,8 +983,6 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 
 		return;
 	}
-
-	return;
 }
 
 //---------------------------------------------------------------------------------
@@ -982,7 +991,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 //---------------------------------------------------------------------------------
 void CP2MMServerPlugin::ClientActive(edict_t* pEntity)
 {
-	short userid = engineServer->GetPlayerUserId(pEntity);
+	int userid = engineServer->GetPlayerUserId(pEntity);
 	int entindex = UserIDToPlayerIndex(userid);
 
 	if (p2mm_spewgameeventinfo.GetBool())
diff --git a/p2mm.hpp b/p2mm.hpp
@@ -53,6 +53,8 @@ class CP2MMServerPlugin : public IServerPluginCallbacks, public IGameEventListen
 
 	virtual int				GetCommandIndex() { return m_iClientCommandIndex; }
 
+	HWND		m_hWnd;
+
 	bool		m_bPluginLoaded;
 	bool		m_bPluginUnloading;
 	int			m_iCurGameIndex;

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`
`15`	`15`	`#include "minhook/include/MinHook.h"`
`16`	`16`
	`17`	`+#include <Windows.h>`
	`18`	`+`
`17`	`19`	`// memdbgon must be the last include file in a .cpp file!!!`
`18`	`20`	`#include "tier0/memdbgon.h"`
`19`	`21`
`@@ -111,6 +113,8 @@ static const char* forbiddenClientCommands[] =`
`111`	`113`	`//---------------------------------------------------------------------------------`
`112`	`114`	`CP2MMServerPlugin::CP2MMServerPlugin()`
`113`	`115`	`{`
	`116`	`+ this->m_hWnd = nullptr; // Game window handle`
	`117`	`+`
`114`	`118`	`// Store game vars`
`115`	`119`	`this->m_bSeenFirstRunPrompt = false; // Flag is set true after CallFirstRunPrompt() is called in VScript.`
`116`	`120`	`this->m_bFirstMapRan = true; // Checks if the game ran for the first time.`
`@@ -160,6 +164,10 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface`
`160`	`164`
`161`	`165`	`P2MMLog(0, false, "Loading plugin...");`
`162`	`166`
	`167`	`+ this->m_hWnd = FindWindow("Valve001", nullptr);`
	`168`	`+ if (!this->m_hWnd)`
	`169`	`+ P2MMLog(1, false, "Failed to find game window Valve001!");`
	`170`	`+`
`163`	`171`	`// Determine which Portal 2 branch game we are running and if its supported.`
`164`	`172`	`bool unsupportedGame = false;`
`165`	`173`	`const char* gameMainDir = GetGameMainDir();`
`@@ -221,71 +229,74 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface`
`221`	`229`	`return false;`
`222`	`230`	`}`
`223`	`231`	`if (unsupportedGame && CommandLine()->FindParm("-forcep2mmload"))`
	`232`	`+ {`
	`233`	`+ MessageBox(this->m_hWnd, "P2:MM is being run with a unsupported Source Engine/Portal 2 branch game! Proceed with caution as crashes and bugs could occur!", "Unsupported P2:MM Game", MB_OK \| MB_ICONEXCLAMATION);`
`224`	`234`	`P2MMLog(1, false, "P2:MM is being run with a unsupported Source Engine/Portal 2 branch game! Proceed with caution as crashes and bugs could occur!");`
	`235`	`+ }`
`225`	`236`
`226`	`237`	`P2MMLog(0, true, "Connecting tier libraries...");`
`227`	`238`	`ConnectTier1Libraries(&interfaceFactory, 1);`
`228`	`239`	`ConnectTier2Libraries(&interfaceFactory, 1);`
`229`	`240`
`230`	`241`	`// Make sure that all the interfaces needed are loaded and useable`
`231`	`242`	`P2MMLog(0, true, "Loading interfaces...");`
`232`		`- engineServer = (IVEngineServer*)interfaceFactory(INTERFACEVERSION_VENGINESERVER, 0);`
	`243`	`+ engineServer = static_cast<IVEngineServer*>(interfaceFactory(INTERFACEVERSION_VENGINESERVER, 0));`
`233`	`244`	`if (!engineServer)`
`234`	`245`	`{`
`235`	`246`	`P2MMLog(1, false, "Unable to load engineServer!");`
`236`	`247`	`this->m_bNoUnload = true;`
`237`	`248`	`return false;`
`238`	`249`	`}`
`239`	`250`
`240`		`- engineClient = (IVEngineClient*)interfaceFactory(VENGINE_CLIENT_INTERFACE_VERSION, 0);`
	`251`	`+ engineClient = static_cast<IVEngineClient*>(interfaceFactory(VENGINE_CLIENT_INTERFACE_VERSION, 0));`
`241`	`252`	`if (!engineClient)`
`242`	`253`	`{`
`243`	`254`	`P2MMLog(1, false, "Unable to load engineClient!");`
`244`	`255`	`this->m_bNoUnload = true;`
`245`	`256`	`return false;`
`246`	`257`	`}`
`247`	`258`
`248`		`- g_pPlayerInfoManager = (IPlayerInfoManager*)gameServerFactory(INTERFACEVERSION_PLAYERINFOMANAGER, 0);`
	`259`	`+ g_pPlayerInfoManager = static_cast<IPlayerInfoManager*>(gameServerFactory(INTERFACEVERSION_PLAYERINFOMANAGER, 0));`
`249`	`260`	`if (!g_pPlayerInfoManager)`
`250`	`261`	`{`
`251`	`262`	`P2MMLog(1, false, "Unable to load g_pPlayerInfoManager!");`
`252`	`263`	`this->m_bNoUnload = true;`
`253`	`264`	`return false;`
`254`	`265`	`}`
`255`	`266`
`256`		`- g_pScriptVM = (IScriptVM*)interfaceFactory(VSCRIPT_INTERFACE_VERSION, 0);`
	`267`	`+ g_pScriptVM = static_cast<IScriptVM*>(interfaceFactory(VSCRIPT_INTERFACE_VERSION, 0));`
`257`	`268`	`if (!g_pScriptVM)`
`258`	`269`	`{`
`259`	`270`	`P2MMLog(1, false, "Unable to load g_pScriptVM!");`
`260`	`271`	`this->m_bNoUnload = true;`
`261`	`272`	`return false;`
`262`	`273`	`}`
`263`	`274`
`264`		`- g_pServerTools = (IServerTools*)gameServerFactory(VSERVERTOOLS_INTERFACE_VERSION, 0);`
	`275`	`+ g_pServerTools = static_cast<IServerTools*>(gameServerFactory(VSERVERTOOLS_INTERFACE_VERSION, 0));`
`265`	`276`	`if (!g_pServerTools)`
`266`	`277`	`{`
`267`	`278`	`P2MMLog(1, false, "Unable to load g_pServerTools!");`
`268`	`279`	`this->m_bNoUnload = true;`
`269`	`280`	`return false;`
`270`	`281`	`}`
`271`	`282`
`272`		`- g_pGameEventManager = (IGameEventManager2*)interfaceFactory(INTERFACEVERSION_GAMEEVENTSMANAGER2, 0);`
	`283`	`+ g_pGameEventManager = static_cast<IGameEventManager2*>(interfaceFactory(INTERFACEVERSION_GAMEEVENTSMANAGER2, 0));`
`273`	`284`	`if (!g_pGameEventManager)`
`274`	`285`	`{`
`275`	`286`	`P2MMLog(1, false, "Unable to load g_pGameEventManager!");`
`276`	`287`	`this->m_bNoUnload = true;`
`277`	`288`	`return false;`
`278`	`289`	`}`
`279`	`290`
`280`		`- g_pPluginHelpers = (IServerPluginHelpers*)interfaceFactory(INTERFACEVERSION_ISERVERPLUGINHELPERS, 0);`
	`291`	`+ g_pPluginHelpers = static_cast<IServerPluginHelpers*>(interfaceFactory(INTERFACEVERSION_ISERVERPLUGINHELPERS, 0));`
`281`	`292`	`if (!g_pPluginHelpers)`
`282`	`293`	`{`
`283`	`294`	`P2MMLog(1, false, "Unable to load g_pPluginHelpers!");`
`284`	`295`	`this->m_bNoUnload = true;`
`285`	`296`	`return false;`
`286`	`297`	`}`
`287`	`298`
`288`		`- g_pFileSystem = (IFileSystem*)interfaceFactory(FILESYSTEM_INTERFACE_VERSION, 0);`
	`299`	`+ g_pFileSystem = static_cast<IFileSystem*>(interfaceFactory(FILESYSTEM_INTERFACE_VERSION, 0));`
`289`	`300`	`if (!g_pFileSystem)`
`290`	`301`	`{`
`291`	`302`	`P2MMLog(1, false, "Unable to load g_pFileSystem!");`
`@@ -540,8 +551,8 @@ void CP2MMServerPlugin::LevelInit(char const* pMapName)`
`540`	`551`
`541`	`552`	`if (!g_P2MMServerPlugin.m_bSeenFirstRunPrompt) return;`
`542`	`553`
`543`		- std::string changemapstr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
`544`		`- g_pDiscordIntegration->SendWebHookEmbed("Server", changemapstr, EMBED_COLOR_SERVER, false);`
	`554`	+ std::string changeMapStr = std::string("The server has changed the map to: `" + std::string(CURMAPFILENAME) + "`");
	`555`	`+ g_pDiscordIntegration->SendWebHookEmbed("Server", changeMapStr, EMBED_COLOR_SERVER, false);`
`545`	`556`
`546`	`557`	`// Update Discord RPC to update current map information.`
`547`	`558`	`g_pDiscordIntegration->UpdateDiscordRPC();`
`@@ -552,7 +563,7 @@ void CP2MMServerPlugin::LevelInit(char const* pMapName)`
`552`	`563`	`//---------------------------------------------------------------------------------`
`553`	`564`	`PLUGIN_RESULT CP2MMServerPlugin::ClientCommand(edict_t* pEntity, const CCommand& args)`
`554`	`565`	`{`
`555`		`- // Check if its a valid player edict.`
	`566`	`+ // Check if it's a valid player edict.`
`556`	`567`	`if (!pEntity \|\| pEntity->IsFree())`
`557`	`568`	`return PLUGIN_CONTINUE;`
`558`	`569`
`@@ -619,8 +630,8 @@ PLUGIN_RESULT CP2MMServerPlugin::ClientCommand(edict_t* pEntity, const CCommand&`
`619`	`630`	`//---------------------------------------------------------------------------------`
`620`	`631`	`void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`621`	`632`	`{`
`622`		`- bool spewinfo = p2mm_spewgameeventinfo.GetBool();`
`623`		`- if (spewinfo)`
	`633`	`+ bool spewInfo = p2mm_spewgameeventinfo.GetBool();`
	`634`	`+ if (spewInfo)`
`624`	`635`	`{`
`625`	`636`	`P2MMLog(0, true, "Game Event Fired: %s", event->GetName());`
`626`	`637`	`P2MMLog(0, true, "VScript VM Working?: %s", (g_pScriptVM) ? "Working" : "Not Working!");`
`@@ -635,7 +646,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`635`	`646`	`*/`
`636`	`647`	`if (FStrEq(event->GetName(), "portal_player_ping"))`
`637`	`648`	`{`
`638`		`- short userid = event->GetInt("userid");`
	`649`	`+ int userid = event->GetInt("userid");`
`639`	`650`	`float ping_x = event->GetFloat("ping_x");`
`640`	`651`	`float ping_y = event->GetFloat("ping_y");`
`641`	`652`	`float ping_z = event->GetFloat("ping_z");`
`@@ -649,7 +660,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`649`	`660`	`g_pScriptVM->Call<short, float, float, float, int>(ge_func, nullptr, false, nullptr, userid, ping_x, ping_y, ping_z, entindex);`
`650`	`661`	`}`
`651`	`662`
`652`		`- if (spewinfo)`
	`663`	`+ if (spewInfo)`
`653`	`664`	`{`
`654`	`665`	`P2MMLog(0, true, "userid: %i", userid);`
`655`	`666`	`P2MMLog(0, true, "ping_x: %f", ping_x);`
`@@ -665,9 +676,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`665`	`676`	`"userid" "short" // user ID on server`
`666`	`677`	`"portal2" "bool" // false for portal1 (blue)`
`667`	`678`	`*/`
`668`		`- else if (FStrEq(event->GetName(), "portal_player_portaled"))`
	`679`	`+ if (FStrEq(event->GetName(), "portal_player_portaled"))`
`669`	`680`	`{`
`670`		`- short userid = event->GetInt("userid");`
	`681`	`+ int userid = event->GetInt("userid");`
`671`	`682`	`bool portal2 = event->GetString("text");`
`672`	`683`	`int entindex = UserIDToPlayerIndex(userid);`
`673`	`684`
`@@ -679,7 +690,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`679`	`690`	`g_pScriptVM->Call<short, bool, int>(ge_func, nullptr, false, nullptr, userid, portal2, entindex);`
`680`	`691`	`}`
`681`	`692`
`682`		`- if (spewinfo)`
	`693`	`+ if (spewInfo)`
`683`	`694`	`{`
`684`	`695`	`P2MMLog(0, true, "userid: %i", userid);`
`685`	`696`	`P2MMLog(0, true, "portal2: %s", portal2 ? "true" : "false");`
`@@ -689,7 +700,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`689`	`700`	`return;`
`690`	`701`	`}`
`691`	`702`	`// Event called when a turret hits another turret, "turret_hit_turret" returns nothing.`
`692`		`- else if (FStrEq(event->GetName(), "turret_hit_turret"))`
	`703`	`+ if (FStrEq(event->GetName(), "turret_hit_turret"))`
`693`	`704`	`{`
`694`	`705`	`if (g_pScriptVM)`
`695`	`706`	`{`
`@@ -702,7 +713,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`702`	`713`	`return;`
`703`	`714`	`}`
`704`	`715`	`// Event called when a camera is detached from a wall, "security_camera_detached" returns nothing.`
`705`		`- else if (FStrEq(event->GetName(), "security_camera_detached"))`
	`716`	`+ if (FStrEq(event->GetName(), "security_camera_detached"))`
`706`	`717`	`{`
`707`	`718`	`if (g_pScriptVM)`
`708`	`719`	`{`
`@@ -718,9 +729,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`718`	`729`	`/*`
`719`	`730`	`"userid" "short" // user ID on server`
`720`	`731`	`*/`
`721`		`- else if (FStrEq(event->GetName(), "player_landed"))`
	`732`	`+ if (FStrEq(event->GetName(), "player_landed"))`
`722`	`733`	`{`
`723`		`- short userid = event->GetInt("userid");`
	`734`	`+ int userid = event->GetInt("userid");`
`724`	`735`	`int entindex = UserIDToPlayerIndex(userid);`
`725`	`736`
`726`	`737`	`if (g_pScriptVM)`
`@@ -734,7 +745,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`734`	`745`	`return;`
`735`	`746`	`}`
`736`	`747`	`// Event called when a Blue/Atlas spawns, "player_spawn_blue" returns nothing.`
`737`		`- else if (FStrEq(event->GetName(), "player_spawn_blue"))`
	`748`	`+ if (FStrEq(event->GetName(), "player_spawn_blue"))`
`738`	`749`	`{`
`739`	`750`	`if (g_pScriptVM)`
`740`	`751`	`{`
`@@ -747,7 +758,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`747`	`758`	`return;`
`748`	`759`	`}`
`749`	`760`	`// Event called when a Red/Orange/PBody spawns, "player_spawn_orange" returns nothing.`
`750`		`- else if (FStrEq(event->GetName(), "player_spawn_orange"))`
	`761`	`+ if (FStrEq(event->GetName(), "player_spawn_orange"))`
`751`	`762`	`{`
`752`	`763`	`if (g_pScriptVM)`
`753`	`764`	`{`
`@@ -764,9 +775,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`764`	`775`	`"userid" "short" // user ID who died`
`765`	`776`	`"attacker" "short" // user ID who killed`
`766`	`777`	`*/`
`767`		`- else if (FStrEq(event->GetName(), "player_death"))`
	`778`	`+ if (FStrEq(event->GetName(), "player_death"))`
`768`	`779`	`{`
`769`		`- short userid = event->GetInt("userid");`
	`780`	`+ int userid = event->GetInt("userid");`
`770`	`781`	`short attacker = event->GetInt("attacker");`
`771`	`782`	`int entindex = UserIDToPlayerIndex(userid);`
`772`	`783`
`@@ -790,7 +801,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`790`	`801`	`g_pScriptVM->Call<short, short, int>(ge_func, nullptr, false, nullptr, userid, attacker, entindex);`
`791`	`802`	`}`
`792`	`803`
`793`		`- if (spewinfo)`
	`804`	`+ if (spewInfo)`
`794`	`805`	`{`
`795`	`806`	`P2MMLog(0, true, "userid: %i", userid);`
`796`	`807`	`P2MMLog(0, true, "attacker: %i", attacker);`
`@@ -803,9 +814,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`803`	`814`	`/*`
`804`	`815`	`"userid" "short" // user ID on server`
`805`	`816`	`*/`
`806`		`- else if (FStrEq(event->GetName(), "player_spawn"))`
	`817`	`+ if (FStrEq(event->GetName(), "player_spawn"))`
`807`	`818`	`{`
`808`		`- short userid = event->GetInt("userid");`
	`819`	`+ int userid = event->GetInt("userid");`
`809`	`820`	`int entindex = UserIDToPlayerIndex(userid);`
`810`	`821`
`811`	`822`	`if (g_pScriptVM)`
`@@ -816,7 +827,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`816`	`827`	`g_pScriptVM->Call<short, int>(ge_func, nullptr, false, nullptr, userid, entindex);`
`817`	`828`	`}`
`818`	`829`
`819`		`- if (spewinfo)`
	`830`	`+ if (spewInfo)`
`820`	`831`	`{`
`821`	`832`	`P2MMLog(0, true, "userid: %i", userid);`
`822`	`833`	`P2MMLog(0, true, "entindex: %i", entindex);`
`@@ -838,11 +849,11 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`838`	`849`	`"bot" "bool" // player is a bot`
`839`	`850`	`}`
`840`	`851`	`*/`
`841`		`- else if (FStrEq(event->GetName(), "player_connect"))`
	`852`	`+ if (FStrEq(event->GetName(), "player_connect"))`
`842`	`853`	`{`
`843`	`854`	`const char* name = event->GetString("name");`
`844`	`855`	`int index = event->GetInt("index");`
`845`		`- short userid = event->GetInt("userid");`
	`856`	`+ int userid = event->GetInt("userid");`
`846`	`857`	`const char* xuid = std::to_string(event->GetUint64("xuid")).c_str();`
`847`	`858`	`const char* networkid = event->GetString("networkid");`
`848`	`859`	`const char* address = event->GetString("address");`
`@@ -860,7 +871,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`860`	`871`	`}`
`861`	`872`	`}`
`862`	`873`
`863`		`- if (spewinfo)`
	`874`	`+ if (spewInfo)`
`864`	`875`	`{`
`865`	`876`	`P2MMLog(0, true, "name: %s", name);`
`866`	`877`	`P2MMLog(0, true, "index: %i", index);`
`@@ -883,11 +894,11 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`883`	`894`	`"networkid" "string" // player network (i.e steam) id`
`884`	`895`	`"bot" "bool" // true if player is a AI bot`
`885`	`896`	`*/`
`886`		`- else if (FStrEq(event->GetName(), "player_info"))`
	`897`	`+ if (FStrEq(event->GetName(), "player_info"))`
`887`	`898`	`{`
`888`	`899`	`const char* name = event->GetString("name");`
`889`	`900`	`int index = event->GetInt("index");`
`890`		`- short userid = event->GetInt("userid");`
	`901`	`+ int userid = event->GetInt("userid");`
`891`	`902`	`const char* networkid = event->GetString("networkid");`
`892`	`903`	`const char* address = event->GetString("address");`
`893`	`904`	`bool bot = event->GetBool("bot");`
`@@ -901,7 +912,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`901`	`912`	`g_pScriptVM->Call<const char, int, short, const char, const char*, bool, int>(ge_func, nullptr, false, nullptr, name, index, userid, networkid, address, bot, entindex);`
`902`	`913`	`}`
`903`	`914`
`904`		`- if (spewinfo)`
	`915`	`+ if (spewInfo)`
`905`	`916`	`{`
`906`	`917`	`P2MMLog(0, true, "name: %s", name);`
`907`	`918`	`P2MMLog(0, true, "index: %i", index);`
`@@ -919,9 +930,9 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`919`	`930`	`"userid" "short" // user ID on server`
`920`	`931`	`"text" "string" // the say text`
`921`	`932`	`*/`
`922`		`- else if (FStrEq(event->GetName(), "player_say"))`
	`933`	`+ if (FStrEq(event->GetName(), "player_say"))`
`923`	`934`	`{`
`924`		`- short userid = event->GetInt("userid");`
	`935`	`+ int userid = event->GetInt("userid");`
`925`	`936`	`const char* text = event->GetString("text");`
`926`	`937`	`int entindex = UserIDToPlayerIndex(userid);`
`927`	`938`
`@@ -963,7 +974,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`963`	`974`	`g_pScriptVM->Call<short, const char*, int>(ge_func, nullptr, false, nullptr, userid, text, entindex);`
`964`	`975`	`}`
`965`	`976`
`966`		`- if (spewinfo)`
	`977`	`+ if (spewInfo)`
`967`	`978`	`{`
`968`	`979`	`P2MMLog(0, true, "userid: %i", userid);`
`969`	`980`	`P2MMLog(0, true, "text: %s", text);`
`@@ -972,8 +983,6 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`972`	`983`
`973`	`984`	`return;`
`974`	`985`	`}`
`975`		`-`
`976`		`- return;`
`977`	`986`	`}`
`978`	`987`
`979`	`988`	`//---------------------------------------------------------------------------------`
`@@ -982,7 +991,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)`
`982`	`991`	`//---------------------------------------------------------------------------------`
`983`	`992`	`void CP2MMServerPlugin::ClientActive(edict_t* pEntity)`
`984`	`993`	`{`
`985`		`- short userid = engineServer->GetPlayerUserId(pEntity);`
	`994`	`+ int userid = engineServer->GetPlayerUserId(pEntity);`
`986`	`995`	`int entindex = UserIDToPlayerIndex(userid);`
`987`	`996`
`988`	`997`	`if (p2mm_spewgameeventinfo.GetBool())`