Extend menu handler & item callbacks

alliedmodders · Apr 11, 2016 · 70adea7 · 70adea7
1 parent ffa4e05
commit 70adea7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 22 deletions.
diff --git a/amxmodx/meta_api.cpp b/amxmodx/meta_api.cpp
@@ -1072,14 +1072,31 @@ void C_ClientCommand(edict_t *pEntity)
 					if (item == MENU_BACK)
 					{
 						pMenu->Display(pPlayer->index, pPlayer->page - 1);
-					} else if (item == MENU_MORE) {
+					}
+					else if (item == MENU_MORE)
+					{
 						pMenu->Display(pPlayer->index, pPlayer->page + 1);
-					} else {
-						ret = executeForwards(pMenu->func, static_cast<cell>(pPlayer->index), static_cast<cell>(menu), static_cast<cell>(item));
+					}
+					else
+					{
+						menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(item));
+
+						if (pItem)
+						{
+							ret = executeForwards(pMenu->func, static_cast<cell>(pPlayer->index), static_cast<cell>(menu), static_cast<cell>(item), 
+									static_cast<cell>(pItem->access), pItem->cmd.chars(), pItem->name.chars(), static_cast<cell>(pItem->handler));
+						}
+						else
+						{
+							ret = executeForwards(pMenu->func, static_cast<cell>(pPlayer->index), static_cast<cell>(menu), static_cast<cell>(item), 0, "", "", 0);
+						}
+
 						if (ret & 2)
 						{
 							result = MRES_SUPERCEDE;
-						} else if (ret & 1) {
+						}
+						else if (ret & 1)
+						{
 							RETURN_META(MRES_SUPERCEDE);
 						}
 					}

diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp
@@ -430,7 +430,9 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 
 		if (pItem->handler != -1)
 		{
-			ret = executeForwards(pItem->handler, static_cast<cell>(player), static_cast<cell>(thisId), static_cast<cell>(i));
+			ret = executeForwards(pItem->handler, static_cast<cell>(player), static_cast<cell>(thisId), static_cast<cell>(i),
+					static_cast<cell>(pItem->access), pItem->cmd.chars(), pItem->name.chars(), static_cast<cell>(pItem->handler));
+
 			if (ret == ITEM_ENABLED)
 			{
 				enabled = true;
@@ -441,7 +443,8 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 
 		if (pItem->pfn)
 		{
-			ret = (pItem->pfn)(player, thisId, i);
+			ret = (pItem->pfn)(player, thisId, i, pItem->access, pItem->cmd.chars(), pItem->name.chars(), pItem->handler);
+
 			if (ret == ITEM_ENABLED)
 			{
 				enabled = true;
@@ -633,7 +636,7 @@ static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
 	validate_menu_text(title);
 	char *handler = get_amxstring(amx, params[2], 1, len);
 
-	int func = registerSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
+	int func = registerSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_STRING, FP_STRING, FP_CELL, FP_DONE);
 
 	if (func == -1)
 	{
@@ -878,7 +881,7 @@ static cell AMX_NATIVE_CALL menu_makecallback(AMX *amx, cell *params)
 	int len;
 	char *name = get_amxstring(amx, params[1], 0, len);
 
-	int id = registerSPForwardByName(amx, name, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
+	int id = registerSPForwardByName(amx, name, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_STRING, FP_STRING, FP_CELL, FP_DONE);
 
 	if (id == -1)
 	{

diff --git a/amxmodx/newmenus.h b/amxmodx/newmenus.h
@@ -31,7 +31,7 @@
 #define MPROP_PADMENU	9
 #define MPROP_SET_NUMBER_COLOR	10
 
-typedef int (*MENUITEM_CALLBACK)(int, int, int);
+typedef int (*MENUITEM_CALLBACK)(int, int, int, int, const char *, const char *, int);
 
 class BlankItem
 {

diff --git a/plugins/include/newmenus.inc b/plugins/include/newmenus.inc
@@ -39,13 +39,17 @@
  *
  * The handler function should be prototyped as:
  *
- * public <function>(id, menu, item)
- *  id     - Client the menu is being acted upon.
- *  menu   - Menu resource identifier.
- *  item   - Item the client selected.  If less than 0, the menu was 
- *           cancelled and the item is a status code.  menu_display 
- *			 should never be called immediately if the item is a status 
- *			 code, for re-entrancy reasons.
+ * public <function>(id, menu, item, access, const info[], const name[], callback)
+ *  id         - Client the menu is being acted upon.
+ *  menu       - Menu resource identifier.
+ *  item       - Item the client selected.  If less than 0, the menu was
+ *               cancelled and the item is a status code.  menu_display
+ *               should never be called immediately if the item is a status
+ *               code, for re-entrancy reasons.
+ *  access     - Access of the selected item.
+ *  info       - Info string of the selected item.
+ *  name       - Name of the selected item.
+ *  callback   - Callback ID of the selected item.
  *
  * The handler function should always return PLUGIN_HANDLED to block 
  * any old menu handlers from potentially feeding on the menu, unless 
@@ -67,12 +71,16 @@ native menu_create(const title[], const handler[], ml=0);
  *
  * The handler function should be prototyped as:
  *
- * public <function>(id, menu, item)
- *  id      - Client index being displayed to.
- *  menu    - Menu resource identifier.
- *  item    - Item being drawn.
- * <return> - ITEM_IGNORE to use the default functionality.  ITEM_ENABLED to 
- *            explicitly enable or ITEM_DISABLED to explicitly disable.
+ * public <function>(id, menu, item, access, const info[], const name[], callback)
+ *  id            - Client index being displayed to.
+ *  menu          - Menu resource identifier.
+ *  item          - Item being drawn.
+ *  access        - Item access.
+ *  info          - Item info string.
+ *  name          - Item name.
+ *  callback      - Item callback ID.
+ *  <return>      - ITEM_IGNORE to use the default functionality.  ITEM_ENABLED to 
+ *                  explicitly enable or ITEM_DISABLED to explicitly disable.
  *
  * @param function		Function name.
  * @return				Menu callback ID.