From 79787cb8686d39ad3e1e2e8355e2a442eb3dd11b Mon Sep 17 00:00:00 2001
From: throwaway47777 <132854917+throwaway47777@users.noreply.github.com>
Date: Wed, 13 Sep 2023 09:28:35 -0700
Subject: [PATCH] Fix admin-flatfile.sp includes (#2043)

* Move admin-flatfile to plugins dir

* Fix admin-flatfile sp includes
---
 plugins/AMBuilder                              | 7 ++-----
 plugins/{admin-flatfile => }/admin-flatfile.sp | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename plugins/{admin-flatfile => }/admin-flatfile.sp (91%)

diff --git a/plugins/AMBuilder b/plugins/AMBuilder
index c1fae87b..776fc87c 100644
--- a/plugins/AMBuilder
+++ b/plugins/AMBuilder
@@ -24,7 +24,8 @@ files = [
   'basecommands.sp',
   'mapchooser.sp',
   'randomcycle.sp',
-  'sql-admin-manager.sp'
+  'sql-admin-manager.sp',
+  'admin-flatfile.sp'
 ]
 
 spcomp_argv = [
@@ -60,7 +61,3 @@ for script_file in files:
   script_path = os.path.join(builder.currentSourcePath, script_file)
   smx_file = os.path.splitext(script_file)[0] + '.smx'
   build_plugin(script_path, smx_file)
-
-# This one has to be special.
-build_plugin(os.path.join(builder.currentSourcePath, 'admin-flatfile', 'admin-flatfile.sp'),
-             'admin-flatfile.smx')
diff --git a/plugins/admin-flatfile/admin-flatfile.sp b/plugins/admin-flatfile.sp
similarity index 91%
rename from plugins/admin-flatfile/admin-flatfile.sp
rename to plugins/admin-flatfile.sp
index 6e9bccd0..ca14b1db 100644
--- a/plugins/admin-flatfile/admin-flatfile.sp
+++ b/plugins/admin-flatfile.sp
@@ -52,10 +52,10 @@ int g_IgnoreLevel = 0;               /* Nested ignored section count, so users c
 int g_CurrentLine = 0;               /* Current line we're on */
 char g_Filename[PLATFORM_MAX_PATH];  /* Used for error messages */
 
-#include "admin-overrides.sp"
-#include "admin-groups.sp"
-#include "admin-users.sp"
-#include "admin-simple.sp"
+#include "admin-flatfile/admin-overrides.sp"
+#include "admin-flatfile/admin-groups.sp"
+#include "admin-flatfile/admin-users.sp"
+#include "admin-flatfile/admin-simple.sp"
 
 public void OnRebuildAdminCache(AdminCachePart part)
 {