Minor clean up of some code. Small removals, small adds.

Author: OrsellGit

commands.cpp

@@ -129,8 +129,10 @@ CON_COMMAND_F_COMPLETION(p2mm_map, "Starts up a P2:MM session with a requested m
 
 			// Get the current act so we can start the right main menu music.
 			int iAct = ConVarRef("ui_lastact_played").GetInt();
-			if (iAct > 5) iAct = 5;
-			else if (iAct < 1) iAct = 1;
+			if (iAct > 5)
+				iAct = 5;
+			else if (iAct < 1)
+				iAct = 1;
 
 			// Put the command to start the music and the act number together.
 			char completePvCmd[sizeof("playvol \"#music/mainmenu/portal2_background0%d\" 0.35") + sizeof(iAct)] = { 0 };
@@ -142,6 +144,7 @@ CON_COMMAND_F_COMPLETION(p2mm_map, "Starts up a P2:MM session with a requested m
 			UpdateMapsList();
 			return;
 		}
+		
 		V_strcpy(requestedMap, p2mm_lastmap.GetString());
 		Log(INFO, true, "P2MM_LASTMAP called! Running Last Map: \"%s\"", requestedMap);
 	}
@@ -204,13 +207,13 @@ CON_COMMAND(p2mm_respawnall, "Respawns all players.")
 	}
 }
 
-static bool m_ConVarConCommandsShown = false; // Bool to track if the hidden ConVars and ConCommands are showing.
+static bool cvccShown = false; // Bool to track if the hidden ConVars and ConCommands are showing.
 static std::vector<ConCommandBase*> toggledCVCCs; // List of toggled ConVars and ConCommands with the FCVAR_DEVELOPMENTONLY and FCVAR_HIDDEN ConVar flags removed.
 CON_COMMAND_F(p2mm_toggle_dev_cc_cvars, "Toggle showing any ConVars and ConCommands that have the FCVAR_DEVELOPMENTONLY and FCVAR_HIDDEN ConVar flags.", FCVAR_HIDDEN)
 {
 	int iToggleCount = 0; // To tell the user how many ConVars and ConCommands where toggle to show or hide.
 
-	if (m_ConVarConCommandsShown)
+	if (cvccShown)
 	{
 		// Hide the ConVars and ConCommands
 		for (ConCommandBase* pCommandVarName : toggledCVCCs)
@@ -219,11 +222,11 @@ CON_COMMAND_F(p2mm_toggle_dev_cc_cvars, "Toggle showing any ConVars and ConComma
 			iToggleCount++;
 		}
 		toggledCVCCs.clear();
-		m_ConVarConCommandsShown = false;
+		cvccShown = false;
 	}
 	else
 	{
-		// Unhide the ConVars and ConCommands
+		// Remove development and hidden flags from the ConVars and ConCommands
 		FOR_ALL_CONSOLE_COMMANDS(pCommandVarName)
 		{
 			if (pCommandVarName->IsFlagSet(FCVAR_DEVELOPMENTONLY) || pCommandVarName->IsFlagSet(FCVAR_HIDDEN))
@@ -233,10 +236,10 @@ CON_COMMAND_F(p2mm_toggle_dev_cc_cvars, "Toggle showing any ConVars and ConComma
 				toggledCVCCs.push_back(pCommandVarName);
 			}
 		}
-		m_ConVarConCommandsShown = true;
+		cvccShown = true;
 	}
 
-	Log(INFO, false, "%s %i ConVars/ConCommands!", m_ConVarConCommandsShown ? "Unhid" : "Hid", iToggleCount);
+	Log(INFO, false, "%s %i ConVars/ConCommands!", cvccShown ? "Unhid" : "Hid", iToggleCount);
 }
 
 //---------------------------------------------------------------------------------

globals.hpp

@@ -74,7 +74,7 @@ enum : std::uint8_t
 };
 
 // iCurGameIndex enum.
-enum : std::uint8_t
+inline enum GameIndexes : std::uint8_t
 {
 	PORTAL_2 = 0,
 	PORTAL_STORIES_MEL,
@@ -83,7 +83,7 @@ enum : std::uint8_t
 	INFRA,
 	STANLEY_PARABLE,
 	DIVINITY
-};
+} GameIndex;
 
 // ClientPrint msg_dest macros.
 enum : std::uint8_t
@@ -224,7 +224,7 @@ inline edict_t* INDEXENT(const int iEdictNum)
 }
 
 //---------------------------------------------------------------------------------
-// Purpose: VScript instance to void*. void* because we can not assume that the returned instance is a CBaseEntity* because VScript instances can be 
+// Purpose: VScript instance to void*. void* because we can not assume that the returned instance is a CBaseEntity* because VScript instances can be a different class type.
 //---------------------------------------------------------------------------------
 inline void* HSCRIPTENT(const HSCRIPT ent)
 {

p2mm.cpp

@@ -138,7 +138,7 @@ CP2MMServerPlugin::CP2MMServerPlugin()
 //---------------------------------------------------------------------------------
 CP2MMServerPlugin::~CP2MMServerPlugin()
 {
-	m_nDebugID = EVENT_DEBUG_ID_SHUTDOWN;
+	this->m_nDebugID = EVENT_DEBUG_ID_SHUTDOWN;
 }
 
 //---------------------------------------------------------------------------------
@@ -164,9 +164,10 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateInt
 
 	Log(INFO, false, "Loading plugin...");
 
+	Log(INFO, true, "Grabbing game window handle...");
 	this->m_hWnd = FindWindow("Valve001", nullptr);
 	if (!this->m_hWnd)
-		Log(WARNING, false, "Failed to find game window Valve001!");
+		Log(WARNING, false, "Failed to find game window!");
 
 	// Determine which Portal 2 branch game we are running and if its supported.
 	// TODO: Rework this to be a switch case then if and else if statements.
@@ -209,6 +210,7 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateInt
 	// 	// Unsupported...
 	// 	unsupportedGame = true;
 	// }
+	// Have to find "Divinity" in the gameMainDir string as it's a big folder path due to being a SourceMod.
 	else if ((std::strstr(gameMainDir, "Divinity")))
 	{
 		this->m_iCurGameIndex = DIVINITY;
@@ -229,7 +231,8 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateInt
 	}
 	if (unsupportedGame && CommandLine()->FindParm("-forcep2mmload"))
 	{
-		MessageBox(this->m_hWnd, "P2:MM is being run with a unsupported Source Engine/Portal 2 branch game!\n\"-forcep2mmload\" has been specified to stop the plugin shutting down the game.\nProceed with caution as crashes and bugs could occur!", "Unsupported P2:MM Game", MB_OK | MB_ICONEXCLAMATION);
+		if (this->m_hWnd)
+			MessageBox(this->m_hWnd, "P2:MM is being run with a unsupported Source Engine/Portal 2 branch game!\n\"-forcep2mmload\" has been specified to stop the plugin shutting down the game.\nProceed with caution as crashes and bugs could occur!", "Unsupported P2:MM Game", MB_OK | MB_ICONEXCLAMATION);
 		Log(WARNING, false, R"(P2:MM is being run with a unsupported Source Engine/Portal 2 branch game! "-forcep2mmload" has been specified to stop the plugin shutting down the game. Proceed with caution as crashes and bugs could occur!)");
 	}
 
@@ -415,13 +418,14 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateInt
 		// NoSteamLogon disconnect hook patch.
 		Log(INFO, true, "Hooking CSteam3Server::OnGSClientDenyHelper...");
 		MH_CreateHook(
-			(LPVOID)Memory::Scanner::Scan<void*>(ENGINEDLL, "55 8B EC 83 EC 08 53 56 57 8B F1 E8 ?? ?? ?? ?? 8B"),
+			Memory::Scanner::Scan<void*>(ENGINEDLL, "55 8B EC 83 EC 08 53 56 57 8B F1 E8 ?? ?? ?? ?? 8B"),
 			&CSteam3Server__OnGSClientDenyHelper_hook, reinterpret_cast<void**>(&CSteam3Server__OnGSClientDenyHelper_orig)
 		);
 
-		// For p2mm_instantrespawn.
+		
 		if (!this->m_bP2SMPluginLoaded)
 		{
+			// For p2mm_instantrespawn.
 			Log(INFO, true, "Hooking CPortal_Player::PlayerDeathThink...");
 			MH_CreateHook(
 				Memory::Scanner::Scan(SERVERDLL, "53 8B DC 83 EC 08 83 E4 F0 83 C4 04 55 8B 6B ?? 89 6C 24 ?? 8B EC A1 ?? ?? ?? ?? F3 0F 10 40 ?? F3 0F 58 05 ?? ?? ?? ?? 83 EC 28 56 57 6A 00 51 8B F1 F3 0F 11 04 24 E8 ?? ?? ?? ?? 6A 03"),
@@ -474,10 +478,11 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateInt
 
 		Log(INFO, true, "Enabling hooks...");
 		MH_EnableHook(MH_ALL_HOOKS);
-	} catch (const std::exception& ex)
+	}
+	catch (const std::exception& ex)
 	{
 		assert(0 && "Failed to implement patch or hook!");
-		Log(INFO, false, R"(Failed to load plugin! :( Exception: "%s")", ex.what());
+		Log(WARNING, false, R"(Failed to load plugin! :( Exception: "%s")", ex.what());
 		this->m_bNoUnload = true;
 		return false;
 	}
@@ -524,7 +529,7 @@ void CP2MMServerPlugin::Unload(void)
 		CommandLine()->RemoveParm("-allowspectators");
 	}
 
-	Log(INFO, true, "Unregistering ConVars...");
+	Log(INFO, true, "Unregistering ConVars/ConCommands...");
 	ConVar_Unregister();
 
 	Log(INFO, true, "Disconnecting tier libraries...");
@@ -539,7 +544,7 @@ void CP2MMServerPlugin::Unload(void)
 		// Linked portal doors event crash patch
 		if (!this->m_bP2SMPluginLoaded)
 		{
-			Log(INFO, true, "Unfixing linked portal doors...");
+			Log(INFO, true, "Un-patching linked portal doors...");
 			Memory::ReplacePattern("server", "EB 14 87 04 05 00 00 8B 16", "0F B6 87 04 05 00 00 8B 16");
 		}
 
@@ -573,7 +578,7 @@ void CP2MMServerPlugin::Unload(void)
 	catch (const std::exception& ex)
 	{
 		assert(0 && "Failed to fully unload!");
-		Log(INFO, false, R"(Encountered error when unload plugin! :( Exception: "%s")", ex.what());
+		Log(WARNING, false, R"(Encountered error when unload plugin! :( Exception: "%s")", ex.what());
 		Log(ERRORR, false, "P2:MM failed to unload!\nGame has to be shutdown as possibly some other patches/hooks are still connected which can cause issues!");
 	}