UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fully convert dynamicmenu to transitional enum structs. (#1082)

Browse Source
This commit is contained in:
David Anderson 2019-09-15 14:02:46 -07:00 committed by Headline
parent 14247af323
commit c7392aeded
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
plugins/adminmenu/dynamicmenu.sp
View File

@ -4,26 +4,26 @@
#define ARRAY_STRING_LENGTH 32 #define ARRAY_STRING_LENGTH 32
enum GroupCommands enum struct GroupCommands
{ {
ArrayList:groupListName, ArrayList groupListName;
ArrayList:groupListCommand ArrayList groupListCommand;
}; }
int g_groupList[GroupCommands]; GroupCommands g_groupList;
int g_groupCount; int g_groupCount;
SMCParser g_configParser; SMCParser g_configParser;
enum Places enum struct Places
{ {
Place_Category, int category;
Place_Item, int item;
Place_ReplaceNum int replaceNum;
}; }
char g_command[MAXPLAYERS+1][CMD_LENGTH]; char g_command[MAXPLAYERS+1][CMD_LENGTH];
int g_currentPlace[MAXPLAYERS+1][Places]; Places g_currentPlace[MAXPLAYERS+1];
/** /**
* What to put in the 'info' menu field (for PlayerList and Player_Team menus only) * What to put in the 'info' menu field (for PlayerList and Player_Team menus only)
@ -331,11 +331,11 @@ void ParseConfigs()
g_configParser.OnKeyValue = KeyValue; g_configParser.OnKeyValue = KeyValue;
g_configParser.OnLeaveSection = EndSection; g_configParser.OnLeaveSection = EndSection;
delete g_groupList[groupListName]; delete g_groupList.groupListName;
delete g_groupList[groupListCommand]; delete g_groupList.groupListCommand;
g_groupList[groupListName] = new ArrayList(ARRAY_STRING_LENGTH); g_groupList.groupListName = new ArrayList(ARRAY_STRING_LENGTH);
g_groupList[groupListCommand] = new ArrayList(ARRAY_STRING_LENGTH); g_groupList.groupListCommand = new ArrayList(ARRAY_STRING_LENGTH);
char configPath[256]; char configPath[256];
BuildPath(Path_SM, configPath, sizeof(configPath), "configs/dynamicmenu/adminmenu_grouping.txt"); BuildPath(Path_SM, configPath, sizeof(configPath), "configs/dynamicmenu/adminmenu_grouping.txt");
@ -376,13 +376,13 @@ public SMCResult NewSection(SMCParser smc, const char[] name, bool opt_quotes)
public SMCResult KeyValue(SMCParser smc, const char[] key, const char[] value, bool key_quotes, bool value_quotes) public SMCResult KeyValue(SMCParser smc, const char[] key, const char[] value, bool key_quotes, bool value_quotes)
{ {
g_groupList[groupListName].PushString(key); g_groupList.groupListName.PushString(key);
g_groupList[groupListCommand].PushString(value); g_groupList.groupListCommand.PushString(value);
} }
public SMCResult EndSection(SMCParser smc) public SMCResult EndSection(SMCParser smc)
{ {
g_groupCount = g_groupList[groupListName].Length; g_groupCount = g_groupList.groupListName.Length;
} }
public void DynamicMenuCategoryHandler(TopMenu topmenu, public void DynamicMenuCategoryHandler(TopMenu topmenu,
@ -421,8 +421,8 @@ public void DynamicMenuItemHandler(TopMenu topmenu,
strcopy(g_command[param], sizeof(g_command[]), output.cmd); strcopy(g_command[param], sizeof(g_command[]), output.cmd);
g_currentPlace[param][Place_Item] = location; g_currentPlace[param].item = location;
g_currentPlace[param][Place_ReplaceNum] = 1; g_currentPlace[param].replaceNum = 1;
ParamCheck(param); ParamCheck(param);
} }
@ -436,19 +436,19 @@ public void ParamCheck(int client)
Item outputItem; Item outputItem;
Submenu outputSubmenu; Submenu outputSubmenu;
g_DataArray.GetArray(g_currentPlace[client][Place_Item], outputItem); g_DataArray.GetArray(g_currentPlace[client].item, outputItem);
if (g_currentPlace[client][Place_ReplaceNum] < 1) if (g_currentPlace[client].replaceNum < 1)
{ {
g_currentPlace[client][Place_ReplaceNum] = 1; g_currentPlace[client].replaceNum = 1;
} }
Format(buffer, 5, "#%i", g_currentPlace[client][Place_ReplaceNum]); Format(buffer, 5, "#%i", g_currentPlace[client].replaceNum);
Format(buffer2, 5, "@%i", g_currentPlace[client][Place_ReplaceNum]); Format(buffer2, 5, "@%i", g_currentPlace[client].replaceNum);
if (StrContains(g_command[client], buffer) != -1 || StrContains(g_command[client], buffer2) != -1) if (StrContains(g_command[client], buffer) != -1 || StrContains(g_command[client], buffer2) != -1)
{ {
outputItem.submenus.GetArray(g_currentPlace[client][Place_ReplaceNum] - 1, outputSubmenu); outputItem.submenus.GetArray(g_currentPlace[client].replaceNum - 1, outputSubmenu);
Menu itemMenu = new Menu(Menu_Selection); Menu itemMenu = new Menu(Menu_Selection);
itemMenu.ExitBackButton = true; itemMenu.ExitBackButton = true;
@ -460,8 +460,8 @@ public void ParamCheck(int client)
for (int i = 0; i<g_groupCount; i++) for (int i = 0; i<g_groupCount; i++)
{ {
g_groupList[groupListName].GetString(i, nameBuffer, sizeof(nameBuffer)); g_groupList.groupListName.GetString(i, nameBuffer, sizeof(nameBuffer));
g_groupList[groupListCommand].GetString(i, commandBuffer, sizeof(commandBuffer)); g_groupList.groupListCommand.GetString(i, commandBuffer, sizeof(commandBuffer));
itemMenu.AddItem(commandBuffer, nameBuffer); itemMenu.AddItem(commandBuffer, nameBuffer);
} }
} }
@ -591,7 +591,7 @@ public void ParamCheck(int client)
} }
g_command[client][0] = '\0'; g_command[client][0] = '\0';
g_currentPlace[client][Place_ReplaceNum] = 1; g_currentPlace[client].replaceNum = 1;
} }
} }
@ -622,16 +622,16 @@ public int Menu_Selection(Menu menu, MenuAction action, int param1, int param2)
char infobuffer[NAME_LENGTH+2]; char infobuffer[NAME_LENGTH+2];
Format(infobuffer, sizeof(infobuffer), "\"%s\"", info); Format(infobuffer, sizeof(infobuffer), "\"%s\"", info);
Format(buffer, 5, "#%i", g_currentPlace[param1][Place_ReplaceNum]); Format(buffer, 5, "#%i", g_currentPlace[param1].replaceNum);
ReplaceString(g_command[param1], sizeof(g_command[]), buffer, infobuffer); ReplaceString(g_command[param1], sizeof(g_command[]), buffer, infobuffer);
//replace #num with the selected option (quoted) //replace #num with the selected option (quoted)
Format(buffer, 5, "@%i", g_currentPlace[param1][Place_ReplaceNum]); Format(buffer, 5, "@%i", g_currentPlace[param1].replaceNum);
ReplaceString(g_command[param1], sizeof(g_command[]), buffer, info); ReplaceString(g_command[param1], sizeof(g_command[]), buffer, info);
//replace @num with the selected option (unquoted) //replace @num with the selected option (unquoted)
// Increment the parameter counter. // Increment the parameter counter.
g_currentPlace[param1][Place_ReplaceNum]++; g_currentPlace[param1].replaceNum++;
ParamCheck(param1); ParamCheck(param1);
} }