From 992822ba97345f26c431cc70d657669de9fa9990 Mon Sep 17 00:00:00 2001
From: zaCade <zaCade@hotmail.com>
Date: Sat, 5 Jan 2019 18:48:30 +0100
Subject: [PATCH] Revert "MapAdmin: Split configs per map, instead of one big
 one."

This reverts commit 485542f3174b14cb1603431d435684960937e072.
---
 MapAdmin/scripting/MapAdmin.sp | 40 ++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/MapAdmin/scripting/MapAdmin.sp b/MapAdmin/scripting/MapAdmin.sp
index f4c86a1c..a6e521c4 100644
--- a/MapAdmin/scripting/MapAdmin.sp
+++ b/MapAdmin/scripting/MapAdmin.sp
@@ -5,6 +5,7 @@
 #include <sdktools>
 
 KeyValues g_Config;
+bool g_Enabled = false;
 
 public Plugin myinfo =
 {
@@ -19,30 +20,16 @@ public void OnPluginStart()
 {
 	LoadTranslations("common.phrases");
 
-	RegAdminCmd("sm_adminroom", Command_AdminRoom, ADMFLAG_GENERIC, "sm_adminroom [#userid|name]");
-	RegAdminCmd("sm_stage", Command_Stage, ADMFLAG_GENERIC, "sm_stage <stage>");
-}
-
-public void OnMapStart()
-{
-	if(g_Config)
-		delete g_Config;
-
-	char sMapName[PLATFORM_MAX_PATH];
-	GetCurrentMap(sMapName, sizeof(sMapName));
-
 	char sConfigFile[PLATFORM_MAX_PATH];
-	BuildPath(Path_SM, sConfigFile, sizeof(sConfigFile), "configs/mapadmin/%s.cfg", sMapName);
+	BuildPath(Path_SM, sConfigFile, sizeof(sConfigFile), "configs/MapAdmin.cfg");
 
 	if(!FileExists(sConfigFile))
 	{
-		LogMessage("Could not find mapconfig: \"%s\"", sConfigFile);
+		SetFailState("Could not find config: \"%s\"", sConfigFile);
 		return;
 	}
 
-	LogMessage("Found mapconfig: \"%s\"", sConfigFile);
-
-	g_Config = new KeyValues("mapadmin");
+	g_Config = new KeyValues("maps");
 	if(!g_Config.ImportFromFile(sConfigFile))
 	{
 		delete g_Config;
@@ -50,11 +37,26 @@ public void OnMapStart()
 		return;
 	}
 	g_Config.Rewind();
+
+	RegAdminCmd("sm_adminroom", Command_AdminRoom, ADMFLAG_GENERIC, "sm_adminroom [#userid|name]");
+	RegAdminCmd("sm_stage", Command_Stage, ADMFLAG_GENERIC, "sm_stage <stage>");
+}
+
+public void OnMapStart()
+{
+	g_Enabled = false;
+	g_Config.Rewind();
+
+	char sMapName[PLATFORM_MAX_PATH];
+	GetCurrentMap(sMapName, sizeof(sMapName));
+
+	if(g_Config.JumpToKey(sMapName, false))
+		g_Enabled = true;
 }
 
 public Action Command_AdminRoom(int client, int argc)
 {
-	if(!g_Config)
+	if(!g_Enabled)
 	{
 		ReplyToCommand(client, "[SM] The current map is not supported.");
 		return Plugin_Handled;
@@ -116,7 +118,7 @@ public Action Command_AdminRoom(int client, int argc)
 
 public Action Command_Stage(int client, int argc)
 {
-	if(!g_Config)
+	if(!g_Enabled)
 	{
 		ReplyToCommand(client, "[SM] The current map is not supported.");
 		return Plugin_Handled;