Moved where g_pScriptVM is loaded and removed FirstRunState

Author: OrsellGit

README.md

@@ -27,7 +27,6 @@ void        SendToChat(const char* msg, int playerIndex);              | "Sends
 const char* GetGameMainDir();                                          | "Returns the current game directory. Ex. portal2"
 const char* GetGameRootDir();                                          | "Returns the current root game directory. Ex. Portal 2"
 const char* GetLastMap();                                              | "Returns the last map recorded by the Last Map system."
-bool        FirstRunState();                                           | "Get or set the state of whether the first map was run or not. Set false/true = 0/1 | -1 to get state."
 void        CallFirstRunPrompt();                                      | "Shows the first run prompt if enabled in config.nut."
 int         GetConVarInt(const char* cvName);                          | "Get the integer value of a ConVar."
 const char* GetConVarString(const char* cvName);                       | "Get the string value of a ConVar."

p2mm.cpp

@@ -269,16 +269,6 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, const CreateInt
 		return false;
 	}
 
-	Log(INFO, true, "Loading g_pScriptVM...");
-	g_pScriptVM = static_cast<IScriptVM*>(interfaceFactory(VSCRIPT_INTERFACE_VERSION, 0));
-	if (!g_pScriptVM)
-	{
-		assert(0 && "Unable to load g_pScriptVM!");
-		Log(WARNING, false, "Unable to load g_pScriptVM!");
-		this->m_bNoUnload = true;
-		return false;
-	}
-
 	Log(INFO, true, "Loading g_pServerTools...");
 	g_pServerTools = static_cast<IServerTools*>(gameServerFactory(VSERVERTOOLS_INTERFACE_VERSION, 0));
 	if (!g_pServerTools)
@@ -603,6 +593,8 @@ void CP2MMServerPlugin::SetCommandClient(const int index)
 void RegisterFuncsAndRun();
 void CP2MMServerPlugin::ServerActivate(edict_t* pEdictList, int edictCount, int clientMax)
 {
+	Log(INFO, true, "edictCount: %i", edictCount);
+	Log(INFO, true, "clientMax: %i", clientMax);
 	RegisterFuncsAndRun();
 }
 
@@ -1063,38 +1055,38 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 //---------------------------------------------------------------------------------
 void CP2MMServerPlugin::ClientActive(edict_t* pEntity)
 {
-	int userid = engineServer->GetPlayerUserId(pEntity);
-	int entindex = UserIDToPlayerIndex(userid);
+	const int userID = engineServer->GetPlayerUserId(pEntity);
+	const int entIndex = UserIDToPlayerIndex(userID);
 
 	if (p2mm_spew_gameevent_info.GetBool())
 	{
 		Log(INFO, true, "ClientActive Called!");
-		Log(INFO, true, "userid: %i", userid);
-		Log(INFO, true, "entindex: %i", entindex);
+		Log(INFO, true, "userid: %i", userID);
+		Log(INFO, true, "entindex: %i", entIndex);
 	}
 
 	// Make sure people know that the chat is being recorded if webhook is set
 	if (p2mm_discord_webhooks.GetBool())
 	{
-		if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(entindex))
+		if (CBasePlayer* pPlayer = UTIL_PlayerByIndex(entIndex))
 		{
-			Log(INFO, true, "Warning for enabled webhooks sent to player index %i.", entindex);
+			Log(INFO, true, "Warning for enabled webhooks sent to player index %i.", entIndex);
 			UTIL_ClientPrint(pPlayer, HUD_PRINTTALK, "This lobby has Discord Webhook Integration enabled. All of your in-game messages may be sent to a Discord channel.");
 		}
 	}
 
 	if (g_pScriptVM)
 	{
 		// Handling OnPlayerJoin VScript event
-		if (HSCRIPT opj_func = g_pScriptVM->LookupFunction("OnPlayerJoin"))
+		if (const HSCRIPT opjFunc = g_pScriptVM->LookupFunction("OnPlayerJoin"))
 		{
-			if (HSCRIPT playerHandle = INDEXHANDLE(entindex))
-				g_pScriptVM->Call<HSCRIPT>(opj_func, nullptr, false, nullptr, playerHandle);
+			if (const HSCRIPT playerHandle = INDEXHANDLE(entIndex))
+				g_pScriptVM->Call<HSCRIPT>(opjFunc, nullptr, false, nullptr, playerHandle);
 		}
 
 		// Handle VScript game event function
-		if (HSCRIPT geFunc = g_pScriptVM->LookupFunction("GEClientActive"))
-			g_pScriptVM->Call<int, int>(geFunc, nullptr, false, nullptr, userid, entindex);
+		if (const HSCRIPT geFunc = g_pScriptVM->LookupFunction("GEClientActive"))
+			g_pScriptVM->Call<int, int>(geFunc, nullptr, false, nullptr, userID, entIndex);
 	}
 
 	// Update Discord RPC to update player count.
@@ -1175,6 +1167,7 @@ PLUGIN_RESULT CP2MMServerPlugin::ClientConnect(bool* bAllowConnect, edict_t* pEn
 void CP2MMServerPlugin::ClientFullyConnect(edict_t* pEntity)
 {
 	Log(INFO, true, "Player Joined (ClientFullyConnect)!");
+	p2mm_lastmap.SetValue(CUR_MAPFILE_NAME);
 }
 
 //---------------------------------------------------------------------------------

p2mm.vcxproj

@@ -440,6 +440,9 @@
     <ClInclude Include="scanner.hpp" />
     <ClInclude Include="sdk.hpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="README.md" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

vscript.cpp

@@ -126,18 +126,6 @@ static const char* GetLastMap()
 	return p2mm_lastmap.GetString();
 }
 
-//---------------------------------------------------------------------------------
-// Purpose: Get or set the state of whether the first map was run or not.
-// Set false/true = 0/1 | -1 to get state.
-//---------------------------------------------------------------------------------
-static bool FirstRunState(const int state)
-{
-	if (state == 0 || state == 1)
-		return g_P2MMServerPlugin.m_bFirstMapRan = !!state;
-	
-	return g_P2MMServerPlugin.m_bFirstMapRan;
-}
-
 //---------------------------------------------------------------------------------
 // Purpose: Shows the first run prompt if enabled in config.nut.
 //---------------------------------------------------------------------------------
@@ -309,10 +297,13 @@ static void ShowScoreboard(const int playerIndex, const bool bEnable)
 
 void RegisterFuncsAndRun()
 {
+	// The IScriptVM interface has to be retrieved later than when starting the plugin as it isn't available yet in memory until map is loading.
+	Log(INFO, true, "Loading g_pScriptVM...");
 	g_pScriptVM = **Memory::Scanner::Scan<IScriptVM***>(SERVERDLL, "8B 1D ?? ?? ?? ?? 57 85 DB", 2);
 	if (!g_pScriptVM)
 	{
-		Log(WARNING, false, "Could not register or run our VScript functions!");
+		assert(0 && "Unable to load g_pScriptVM!");
+		Log(ERRORR, false, "P2:MM was unable to load g_pScriptVM!\nThis is required for P2:MM to run!\nPlease report!");
 		return;
 	}
 
@@ -328,7 +319,6 @@ void RegisterFuncsAndRun()
 	ScriptRegisterFunction	   (g_pScriptVM, GetGameMainDir, "Returns the current game directory. Ex. portal2");
 	ScriptRegisterFunction	   (g_pScriptVM, GetGameRootDir, "Returns the current root game directory. Ex. Portal 2");
 	ScriptRegisterFunction	   (g_pScriptVM, GetLastMap, "Returns the last map recorded by the Last Map system.");
-	ScriptRegisterFunction	   (g_pScriptVM, FirstRunState, "Get or set the state of whether the first map was run or not. Set false/true = 0/1 | -1 to get state.");
 	ScriptRegisterFunction	   (g_pScriptVM, CallFirstRunPrompt, "Shows the first run prompt if enabled in config.nut.");
 	ScriptRegisterFunctionNamed(g_pScriptVM, GetConVarInt, "GetConVarInt", "Get the integer value of a ConVar.");
 	ScriptRegisterFunctionNamed(g_pScriptVM, GetConVarString, "GetConVarString", "Get the string value of a ConVar.");