Fixed some weird issues caused by merges

discordrpc.cpp

@@ -58,11 +58,11 @@ void DiscordLog(int level, bool dev, const char* pMsgFormat, ...)
 // Generates a footer with the player count with max allowed client count and also the current map name
 std::string DefaultFooter()
 {
-	// gpGlobals doesn't exist yet at certain situations, so return a blank string.
-	if (!gpGlobals) { return ""; }
+	// g_pGlobals doesn't exist yet at certain situations, so return a blank string.
+	if (!g_pGlobals) { return ""; }
 
 	std::string curplayercount = std::to_string(CURPLAYERCOUNT());
-	std::string maxplayercount = std::to_string(gpGlobals->maxClients);
+	std::string maxplayercount = std::to_string(g_pGlobals->maxClients);
 
 	std::string footer = std::string("Players: ") + curplayercount + "/" + maxplayercount + std::string(" || Current Map: ") + CURMAPNAME;
 

globals.hpp

@@ -36,7 +36,7 @@ class CPortal_Player;
 #define P2MM_DISCORD_CONSOLE_COLOR_WARNING Color(255, 187, 28, 255)
 //#define P2MM_DISCORD_CONSOLE_COLOR_NORMAL Color(88, 101, 242)
 
-#define CURMAPNAME STRING(gpGlobals->mapname)
+#define CURMAPNAME STRING(g_pGlobals->mapname)
 
 // Even programs have to sleep sometimes
 #if _WIN32
@@ -141,7 +141,7 @@ inline edict_t* INDEXENT(int iEdictNum)
 // Get the current player count on the server
 inline int CURPLAYERCOUNT() {
 	int playerCount = 0;
-	for (int i = 1; i < gpGlobals->maxClients; i++)
+	for (int i = 1; i < g_pGlobals->maxClients; i++)
 	{
 		IPlayerInfo* playerinfo = playerinfomanager->GetPlayerInfo(INDEXENT(i));
 		if (playerinfo)

p2mm.cpp

@@ -266,7 +266,7 @@ CON_COMMAND_F_COMPLETION(p2mm_startsession, "Starts up a P2:MM session with a re
 		p2mm_lastmap.SetValue(requestedMap);
 		engineClient->ExecuteClientCmd(std::string(mapString + "mp_coop_community_hub").c_str());
 
-		std::string initmapstr = std::string("Server has started with map: `" + requestedMap + "`");
+		std::string initmapstr = std::string("Server has started with map: `" + std::string(requestedMap) + "`");
 		discordIntegration.SendWebHookEmbed(std::string("Server"), initmapstr, EMBEDCOLOR_SERVER, false);
 	}
 	else
@@ -275,7 +275,7 @@ CON_COMMAND_F_COMPLETION(p2mm_startsession, "Starts up a P2:MM session with a re
 		P2MMLog(0, true, "requestedMap: \"%s\"", requestedMap);
 		engineClient->ExecuteClientCmd(std::string(mapString + requestedMap).c_str());
 
-		std::string initmapstr = std::string("Server has started with map: `" + requestedMap + "`");
+		std::string initmapstr = std::string("Server has started with map: `" + std::string(requestedMap) + "`");
 		discordIntegration.SendWebHookEmbed(std::string("Server"), initmapstr, EMBEDCOLOR_SERVER, false);
 	}
 }
@@ -660,7 +660,7 @@ void CP2MMServerPlugin::LevelInit(char const* pMapName)
 	memset(&discordPresence, 0, sizeof(discordPresence));
 
 	std::string curplayercount = std::to_string(CURPLAYERCOUNT());
-	std::string maxplayercount = std::to_string(gpGlobals->maxClients);
+	std::string maxplayercount = std::to_string(g_pGlobals->maxClients);
 	std::string activityState = std::string("Players: (") + curplayercount + "/" + maxplayercount + ")";
 
 	discordPresence.state = activityState.c_str();
@@ -1102,7 +1102,7 @@ void CP2MMServerPlugin::ClientActive(edict_t* pEntity)
 	}
 
 	std::string curplayercount = std::to_string(CURPLAYERCOUNT());
-	std::string maxplayercount = std::to_string(gpGlobals->maxClients);
+	std::string maxplayercount = std::to_string(g_pGlobals->maxClients);
 	std::string activityState = std::string("Players: (") + curplayercount + "/" + maxplayercount + ")";
 
 	//DiscordRichPresence discordPresence;