From 77737d319f1754db5b624dca47caa46f3bf9bec2 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 31 May 2008 08:01:11 +0000 Subject: [PATCH] removed dynamicmenu folder, names are now consistent --HG-- branch : sourcemod-1.0.x extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.x%402227 --- .../menu.ini => adminmenu_custom.txt} | 0 .../{dynamicmenu => }/adminmenu_grouping.txt | 0 plugins/adminmenu/dynamicmenu.sp | 22 +++++++++++++++++++ 3 files changed, 22 insertions(+) rename configs/{dynamicmenu/menu.ini => adminmenu_custom.txt} (100%) rename configs/{dynamicmenu => }/adminmenu_grouping.txt (100%) diff --git a/configs/dynamicmenu/menu.ini b/configs/adminmenu_custom.txt similarity index 100% rename from configs/dynamicmenu/menu.ini rename to configs/adminmenu_custom.txt diff --git a/configs/dynamicmenu/adminmenu_grouping.txt b/configs/adminmenu_grouping.txt similarity index 100% rename from configs/dynamicmenu/adminmenu_grouping.txt rename to configs/adminmenu_grouping.txt diff --git a/plugins/adminmenu/dynamicmenu.sp b/plugins/adminmenu/dynamicmenu.sp index 92719846..afbd1fda 100644 --- a/plugins/adminmenu/dynamicmenu.sp +++ b/plugins/adminmenu/dynamicmenu.sp @@ -81,8 +81,21 @@ BuildDynamicMenu() new Handle:kvMenu; kvMenu = CreateKeyValues("Commands"); + new String:file[256]; + + /* As a compatibility shim, we use the old file if it exists. */ BuildPath(Path_SM, file, 255, "configs/dynamicmenu/menu.ini"); + if (FileExists(file)) + { + LogError("Warning! configs/dynamicmenu/menu.ini is now configs/adminmenu_custom.txt."); + LogError("Read the 1.0.2 release notes, as the dynamicmenu folder has been removed."); + } + else + { + BuildPath(Path_SM, file, 255, "configs/adminmenu_custom.txt"); + } + FileToKeyValues(kvMenu, file); new String:name[NAME_LENGTH]; @@ -336,6 +349,15 @@ ParseConfigs() decl String:configPath[256]; BuildPath(Path_SM, configPath, sizeof(configPath), "configs/dynamicmenu/adminmenu_grouping.txt"); + if (FileExists(configPath)) + { + LogError("Warning! configs/dynamicmenu/adminmenu_grouping.txt is now configs/adminmenu_grouping.txt."); + LogError("Read the 1.0.2 release notes, as the dynamicmenu folder has been removed."); + } + else + { + BuildPath(Path_SM, configPath, sizeof(configPath), "configs/adminmenu_grouping.txt"); + } if (!FileExists(configPath)) {