Updated variable and macro definition names

Author: OrsellGit

commands.cpp

@@ -186,7 +186,7 @@ CON_COMMAND_F_COMPLETION(p2mm_map, "Starts up a P2:MM session with a requested m
 		engineClient->ExecuteClientCmd(std::string(mapString + "mp_coop_community_hub").c_str());
 
 		std::string initmapstr = std::string("Server has started with map: `" + std::string(requestedMap) + "`");
-		g_pDiscordIntegration->SendWebHookEmbed("Server", initmapstr, EMBEDCOLOR_SERVER, false);
+		g_pDiscordIntegration->SendWebHookEmbed("Server", initmapstr, EMBED_COLOR_SERVER, false);
 	}
 	else
 	{
@@ -195,7 +195,7 @@ CON_COMMAND_F_COMPLETION(p2mm_map, "Starts up a P2:MM session with a requested m
 		engineClient->ExecuteClientCmd(std::string(mapString + requestedMap).c_str());
 
 		std::string initmapstr = std::string("Server has started with map: `" + std::string(requestedMap) + "`");
-		g_pDiscordIntegration->SendWebHookEmbed("Server", initmapstr, EMBEDCOLOR_SERVER, false);
+		g_pDiscordIntegration->SendWebHookEmbed("Server", initmapstr, EMBED_COLOR_SERVER, false);
 	}
 }
 

discordrpc.cpp

@@ -77,7 +77,7 @@ struct WebHookParams
 {
 	std::string title = "Unknown";
 	std::string description = "*Insert Yapping Here*";
-	int			color = EMBEDCOLOR_PLAYER;
+	int			color = EMBED_COLOR_PLAYER;
 	std::string footer = "";
 };
 
@@ -212,21 +212,21 @@ void RPCState(IConVar* var, const char* pOldValue, float flOldValue)
 {
 	if (!g_P2MMServerPlugin.m_bPluginLoaded) return;
 	ConVar* cvRPC = (ConVar*)var;
-	if (cvRPC->GetBool() && !g_pDiscordIntegration->RPCRunning)
+	if (cvRPC->GetBool() && !g_pDiscordIntegration->rpcRunning)
 		g_pDiscordIntegration->StartDiscordRPC();
-	if (!cvRPC->GetBool() && g_pDiscordIntegration->RPCRunning)
+	if (!cvRPC->GetBool() && g_pDiscordIntegration->rpcRunning)
 		g_pDiscordIntegration->ShutdownDiscordRPC();
 }
 ConVar p2mm_discord_rpc("p2mm_discord_rpc", "1", FCVAR_NONE, "Enable or disable Discord RPC with P2:MM.", true, 0, true, 1, RPCState);
 
 static DiscordRichPresence RPC;
 CDiscordIntegration::CDiscordIntegration()
 {
-	this->RPCRunning = false; // Flag bool for whether the RPC is running.
+	this->rpcRunning = false; // Flag bool for whether the RPC is running.
 
 	RPC.state = "";
 	RPC.details = "Starting up...";
-	RPC.startTimestamp = time(0);
+	RPC.startTimestamp = time(nullptr);
 	RPC.endTimestamp = 0;
 	RPC.largeImageKey = "p2mmlogo";
 	RPC.largeImageText = "Portal 2";
@@ -314,7 +314,7 @@ bool CDiscordIntegration::StartDiscordRPC()
 	UpdateDiscordRPC();
 
 	DiscordLog(0, false, "Discord RPC activated!");
-	this->RPCRunning = true;
+	this->rpcRunning = true;
 	return true;
 }
 
@@ -326,7 +326,7 @@ void CDiscordIntegration::ShutdownDiscordRPC()
 	DiscordLog(0, false, "Shutting down Discord RPC...");
 	Discord_ClearPresence();
 	Discord_Shutdown();
-	this->RPCRunning = false;
+	this->rpcRunning = false;
 	DiscordLog(0, false, "Shutdown Discord RPC!");
 }
 
@@ -420,6 +420,8 @@ void CDiscordIntegration::UpdateDiscordRPC()
 
 				V_strcat(details, map->mapname, 128);
 				V_strcat(smallImageKey, "coop", 32);
+				//V_strcat(smallImageKey, "p2mpchapter1", 32);
+				//V_snprintf(smallImageKey, 32, "p2mpchapter%i", map->chapter);
 				V_strcat(smallImageText, map->chaptername, 128);
 			}
 			break;

discordrpc.hpp

@@ -9,19 +9,19 @@
 #include <string>
 
 // Discord Embed Color Codes
-#define EMBEDCOLOR_PLAYER 61297 // Light Green
-#define EMBEDCOLOR_PLAYERDEATH 6881280 // Crimson Red
-#define EMBEDCOLOR_SERVER 4390995 // Dark Purple
+#define EMBED_COLOR_PLAYER 61297 // Light Green
+#define EMBED_COLOR_PLAYERDEATH 6881280 // Crimson Red
+#define EMBED_COLOR_SERVER 4390995 // Dark Purple
 
 class CDiscordIntegration {
 public:
 	CDiscordIntegration();
 
-	void SendWebHookEmbed(std::string title = "Unknown", std::string description = "*Insert Yapping Here*", int color = EMBEDCOLOR_PLAYER, bool hasFooter = true);
+	void SendWebHookEmbed(std::string title = "Unknown", std::string description = "*Insert Yapping Here*", int color = EMBED_COLOR_PLAYER, bool hasFooter = true);
 	bool StartDiscordRPC();
 	void ShutdownDiscordRPC();
 	void UpdateDiscordRPC();
 
-	bool RPCRunning;
+	bool rpcRunning;
 };
 extern CDiscordIntegration* g_pDiscordIntegration;

p2mm.cpp

@@ -299,7 +299,7 @@ bool CP2MMServerPlugin::Load(CreateInterfaceFn interfaceFactory, CreateInterface
 
 	// Discord RPC
 	P2MMLog(0, true, "Checking if Discord RPC should be started...");
-	if (p2mm_discord_rpc.GetBool() && !g_pDiscordIntegration->RPCRunning)
+	if (p2mm_discord_rpc.GetBool() && !g_pDiscordIntegration->rpcRunning)
 	{
 		P2MMLog(0, true, "Discord RPC enabled! Starting!");
 		g_pDiscordIntegration->StartDiscordRPC();
@@ -484,7 +484,7 @@ void CP2MMServerPlugin::Unload(void)
 		P2MMLog(0, false, "Encountered error when unload plugin! Skipping other patches... :( Exception: \"%s\"", ex.what());
 	}
 
-	if (p2mm_discord_rpc.GetBool() && g_pDiscordIntegration->RPCRunning)
+	if (p2mm_discord_rpc.GetBool() && g_pDiscordIntegration->rpcRunning)
 		g_pDiscordIntegration->ShutdownDiscordRPC();
 
 	m_bPluginLoaded = false;
@@ -541,7 +541,7 @@ 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, EMBEDCOLOR_SERVER, false);
+	g_pDiscordIntegration->SendWebHookEmbed("Server", changemapstr, EMBED_COLOR_SERVER, false);
 
 	// Update Discord RPC to update current map information.
 	g_pDiscordIntegration->UpdateDiscordRPC();
@@ -780,7 +780,7 @@ void CP2MMServerPlugin::FireGameEvent(IGameEvent* event)
 				if (playerHandle)
 				{
 					g_pScriptVM->Call<HSCRIPT>(od_func, nullptr, false, nullptr, playerHandle);
-					g_pDiscordIntegration->SendWebHookEmbed(std::string(GetPlayerName(entindex) + std::string(" Died!")), "", EMBEDCOLOR_PLAYERDEATH);
+					g_pDiscordIntegration->SendWebHookEmbed(std::string(GetPlayerName(entindex) + std::string(" Died!")), "", EMBED_COLOR_PLAYERDEATH);
 				}
 			}