From a1240863a472a06d40542cca7f5e7bfc6fbb222b Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Fri, 27 Jul 2018 16:38:30 +0200 Subject: [PATCH 01/13] Update newmenus.cpp --- amxmodx/newmenus.cpp | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index b16b9b57..f1e17322 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1076,6 +1076,100 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params) return 1; } +static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) +{ + GETMENU(params[1]); + + int len = params[0] / sizeof(cell); + + switch(params[2]) + { + case MPROP_PAGE_CALLBACK: return pMenu->pageCallback; + case MPROP_SHOWPAGE: return pMenu->showPageNumber; + case MPROP_SET_NUMBER_COLOR: + { + if (len < 4) + { + LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); + return 0; + } + + set_amxstring(amx, params[3], pMenu->m_ItemColor.chars(), params[4]); + break; + } + case MPROP_PERPAGE: return pMenu->items_per_page; + case MPROP_BACKNAME: + { + if (len < 4) + { + LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); + return 0; + } + + set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_BACK)].chars(), params[4]); + break; + } + case MPROP_NEXTNAME: + { + if (len < 4) + { + LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); + return 0; + } + + set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_MORE)].chars(), params[4]); + break; + } + case MPROP_EXITNAME: + { + if (len < 4) + { + LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); + return 0; + } + + set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_EXIT)].chars(), params[4]); + break; + } + case MPROP_TITLE: + { + if (len < 4) + { + LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); + return 0; + } + + set_amxstring(amx, params[3], pMenu->m_Title.chars(), params[4]); + break; + } + case MPROP_EXITALL: + { + if (len < 4) + { + LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); + return 0; + } + + params[3] = pMenu->m_NeverExit; + params[4] = pMenu->m_ForceExit; + break; + } + case MPROP_ORDER: + { + /* Ignored as of 1.8.0 */ + break; + } + case MPROP_NOCOLORS: return pMenu->m_AutoColors; + default: + { + LogError(amx, AMX_ERR_NATIVE, "Invalid menu setting: %d", params[1]); + return 0; + } + } + + return 1; +} + #define GETMENU_R(p) Menu *pMenu = get_menu_by_id(p); \ if (pMenu == NULL) { \ LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.length()); \ @@ -1185,6 +1279,7 @@ AMX_NATIVE_INFO g_NewMenuNatives[] = {"menu_item_setname", menu_item_setname}, {"menu_destroy", menu_destroy}, {"menu_setprop", menu_setprop}, + {"menu_getprop", menu_getprop}, {"menu_cancel", menu_cancel}, {"player_menu_info", player_menu_info}, {"menu_addblank2", menu_addblank2}, From 05150cde0f77f238d88cda568cc63e2844a4b882 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Fri, 27 Jul 2018 16:39:14 +0200 Subject: [PATCH 02/13] Update newmenus.inc --- plugins/include/newmenus.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/plugins/include/newmenus.inc b/plugins/include/newmenus.inc index 98faad81..3accfaff 100644 --- a/plugins/include/newmenus.inc +++ b/plugins/include/newmenus.inc @@ -367,6 +367,19 @@ native menu_addtext2( menu, const text[] ); */ native menu_setprop(menu, prop, ...); +/** + * Gets a menu property. + * + * @note MPROP_EXIT requires 2 additional integer parameters to be passed. + * + * @param menu Menu resource identifier. + * @param prop MPROP_ constant. + * @param ... Property parameters. + * @return Menu property if the property type is an integer. + * @error Invalid menu resource or property. + */ +native menu_getprop(menu, prop, ...); + /** * Cancels a player's menu, effectively forcing the player to select MENU_EXIT. * The menu will still exist on their screen but any results are invalidated, From d8a7ee4cd98cf0736819b6720f6e76de95d20236 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Fri, 27 Jul 2018 19:07:02 +0200 Subject: [PATCH 03/13] Added menu_getprop() --- amxmodx/newmenus.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index f1e17322..13426e44 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1122,14 +1122,14 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_EXITNAME: { - if (len < 4) - { - LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); - return 0; - } + if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == false) + return 1; + else if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == true) + return 2; + else if(pMenu->m_NeverExit == true && pMenu->m_ForceExit == false) + return -1; - set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_EXIT)].chars(), params[4]); - break; + return 0; } case MPROP_TITLE: { From b8c540a450f85a782e847574688c9c4856ea2118 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Fri, 27 Jul 2018 19:07:46 +0200 Subject: [PATCH 04/13] Added menu_getprop() --- plugins/include/newmenus.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/include/newmenus.inc b/plugins/include/newmenus.inc index 3accfaff..6e8bff6e 100644 --- a/plugins/include/newmenus.inc +++ b/plugins/include/newmenus.inc @@ -370,8 +370,6 @@ native menu_setprop(menu, prop, ...); /** * Gets a menu property. * - * @note MPROP_EXIT requires 2 additional integer parameters to be passed. - * * @param menu Menu resource identifier. * @param prop MPROP_ constant. * @param ... Property parameters. From e6c6021d1e1cb66f21d9275bd9a8397161e82d98 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Sat, 28 Jul 2018 13:58:23 +0200 Subject: [PATCH 05/13] Update newmenus.inc --- plugins/include/newmenus.inc | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/plugins/include/newmenus.inc b/plugins/include/newmenus.inc index 6e8bff6e..9dace847 100644 --- a/plugins/include/newmenus.inc +++ b/plugins/include/newmenus.inc @@ -359,22 +359,29 @@ native menu_addtext2( menu, const text[] ); /** * Sets a menu property. * - * @param menu Menu resource identifier. - * @param prop MPROP_ constant. - * @param ... Property parameters. - * @return 1 on success, 0 on failure. - * @error Invalid menu resource or property. + * @param menu Menu resource identifier. + * @param prop MPROP_ constant. + * @param ... Property parameters. + * @return 1 on success, 0 on failure. + * @error Invalid menu resource or property. */ native menu_setprop(menu, prop, ...); /** * Gets a menu property. * - * @param menu Menu resource identifier. - * @param prop MPROP_ constant. - * @param ... Property parameters. - * @return Menu property if the property type is an integer. - * @error Invalid menu resource or property. + * @note If the value of the property is a string, you should pass + * two additional parameters - one for the buffer and another one + * for the buffer length. Integer values are directly returned by + * the function, so no extra parameters are required. + * Example #1: menu_getprop(iMenu, MPROP_TITLE, szTitle, charsmax(szTitle)) + * Example #2: new iPerPage = menu_getprop(iMenu, MPROP_PERPAGE) + * + * @param menu Menu resource identifier. + * @param prop MPROP_ constant. + * @param ... Property parameters. + * @return Menu property if the property type is an integer. + * @error Invalid menu resource, invalid property or invalid amount of parameters. */ native menu_getprop(menu, prop, ...); @@ -383,8 +390,8 @@ native menu_getprop(menu, prop, ...); * The menu will still exist on their screen but any results are invalidated, * and the callback is invoked. * - * @param player Client index. + * @param player Client index. * @noreturn - * @error Invalid client index. + * @error Invalid client index. */ native menu_cancel(player); From 085037451f417900164aefac50604fc72eb2b8e1 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Sat, 28 Jul 2018 13:59:37 +0200 Subject: [PATCH 06/13] Update newmenus.inc --- plugins/include/newmenus.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/include/newmenus.inc b/plugins/include/newmenus.inc index 9dace847..1427e340 100644 --- a/plugins/include/newmenus.inc +++ b/plugins/include/newmenus.inc @@ -359,11 +359,11 @@ native menu_addtext2( menu, const text[] ); /** * Sets a menu property. * - * @param menu Menu resource identifier. - * @param prop MPROP_ constant. - * @param ... Property parameters. - * @return 1 on success, 0 on failure. - * @error Invalid menu resource or property. + * @param menu Menu resource identifier. + * @param prop MPROP_ constant. + * @param ... Property parameters. + * @return 1 on success, 0 on failure. + * @error Invalid menu resource or property. */ native menu_setprop(menu, prop, ...); @@ -379,9 +379,9 @@ native menu_setprop(menu, prop, ...); * * @param menu Menu resource identifier. * @param prop MPROP_ constant. - * @param ... Property parameters. - * @return Menu property if the property type is an integer. - * @error Invalid menu resource, invalid property or invalid amount of parameters. + * @param ... Property parameters. + * @return Menu property if the property type is an integer. + * @error Invalid menu resource, invalid property or invalid amount of parameters. */ native menu_getprop(menu, prop, ...); @@ -390,8 +390,8 @@ native menu_getprop(menu, prop, ...); * The menu will still exist on their screen but any results are invalidated, * and the callback is invoked. * - * @param player Client index. + * @param player Client index. * @noreturn - * @error Invalid client index. + * @error Invalid client index. */ native menu_cancel(player); From 1f49a283a3f7c9f2e6b5987f37199c6de6b74170 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Sat, 28 Jul 2018 14:00:38 +0200 Subject: [PATCH 07/13] Update newmenus.inc --- plugins/include/newmenus.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/include/newmenus.inc b/plugins/include/newmenus.inc index 1427e340..8183b859 100644 --- a/plugins/include/newmenus.inc +++ b/plugins/include/newmenus.inc @@ -377,11 +377,11 @@ native menu_setprop(menu, prop, ...); * Example #1: menu_getprop(iMenu, MPROP_TITLE, szTitle, charsmax(szTitle)) * Example #2: new iPerPage = menu_getprop(iMenu, MPROP_PERPAGE) * - * @param menu Menu resource identifier. - * @param prop MPROP_ constant. + * @param menu Menu resource identifier. + * @param prop MPROP_ constant. * @param ... Property parameters. - * @return Menu property if the property type is an integer. - * @error Invalid menu resource, invalid property or invalid amount of parameters. + * @return Menu property if the property type is an integer. + * @error Invalid menu resource, invalid property or invalid amount of parameters. */ native menu_getprop(menu, prop, ...); From 11a3b6bd0ea3f56b97402019123a4e5ba6a4ccf7 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Sun, 29 Jul 2018 14:05:52 +0200 Subject: [PATCH 08/13] Update newmenus.cpp --- amxmodx/newmenus.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index 13426e44..0f5b333c 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1144,15 +1144,14 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_EXITALL: { - if (len < 4) - { - LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); - return 0; - } - - params[3] = pMenu->m_NeverExit; - params[4] = pMenu->m_ForceExit; - break; + if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == false) + return 1; + else if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == true) + return 2; + else if(pMenu->m_NeverExit == true && pMenu->m_ForceExit == false) + return -1; + + return 0; } case MPROP_ORDER: { From 1724d4bdd309e4ac25e27150510fd4ad8df169d6 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Fri, 3 Aug 2018 14:37:23 +0200 Subject: [PATCH 09/13] Update newmenus.cpp --- amxmodx/newmenus.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index 0f5b333c..58b443e3 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1122,14 +1122,14 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_EXITNAME: { - if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == false) - return 1; - else if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == true) - return 2; - else if(pMenu->m_NeverExit == true && pMenu->m_ForceExit == false) - return -1; + if (len < 4) + { + LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); + return 0; + } - return 0; + set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_EXIT)].chars(), params[4]); + break; } case MPROP_TITLE: { From fe927f22f4c340c55f3da1a83eb63245e492d78b Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Mon, 3 Sep 2018 19:00:42 +0200 Subject: [PATCH 10/13] Change len to paramsNum --- amxmodx/newmenus.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index 58b443e3..aa88d127 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1080,7 +1080,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) { GETMENU(params[1]); - int len = params[0] / sizeof(cell); + int paramsNum = params[0] / sizeof(cell); switch(params[2]) { @@ -1088,7 +1088,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) case MPROP_SHOWPAGE: return pMenu->showPageNumber; case MPROP_SET_NUMBER_COLOR: { - if (len < 4) + if (paramsNum < 4) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; @@ -1100,7 +1100,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) case MPROP_PERPAGE: return pMenu->items_per_page; case MPROP_BACKNAME: { - if (len < 4) + if (paramsNum < 4) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; @@ -1111,7 +1111,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_NEXTNAME: { - if (len < 4) + if (paramsNum < 4) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; @@ -1122,7 +1122,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_EXITNAME: { - if (len < 4) + if (paramsNum < 4) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; @@ -1133,7 +1133,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_TITLE: { - if (len < 4) + if (paramsNum < 4) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; From 68b038d3414da2a4525f1e2648a62265df87f453 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Mon, 3 Sep 2018 19:21:19 +0200 Subject: [PATCH 11/13] Add enum for arguments --- amxmodx/newmenus.cpp | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index aa88d127..e5aba11c 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1076,80 +1076,90 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params) return 1; } +// Gets a menu property +// native menu_getprop(menu, prop, ...); static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) { - GETMENU(params[1]); + enum args { arg_numargs, arg_menu, arg_prop, arg_buffer, arg_bufferlen }; - int paramsNum = params[0] / sizeof(cell); + GETMENU(params[arg_menu]); - switch(params[2]) + int paramsNum = params[arg_numargs] / sizeof(cell); + + switch(params[arg_prop]) { case MPROP_PAGE_CALLBACK: return pMenu->pageCallback; case MPROP_SHOWPAGE: return pMenu->showPageNumber; case MPROP_SET_NUMBER_COLOR: { - if (paramsNum < 4) + if (paramsNum < arg_bufferlen) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; } - set_amxstring(amx, params[3], pMenu->m_ItemColor.chars(), params[4]); + set_amxstring(amx, params[arg_buffer], pMenu->m_ItemColor.chars(), params[arg_bufferlen]); break; } case MPROP_PERPAGE: return pMenu->items_per_page; case MPROP_BACKNAME: { - if (paramsNum < 4) + if (paramsNum < arg_bufferlen) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; } - set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_BACK)].chars(), params[4]); + set_amxstring(amx, params[arg_buffer], pMenu->m_OptNames[abs(MENU_BACK)].chars(), params[arg_bufferlen]); break; } case MPROP_NEXTNAME: { - if (paramsNum < 4) + if (paramsNum < arg_bufferlen) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; } - set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_MORE)].chars(), params[4]); + set_amxstring(amx, params[arg_buffer], pMenu->m_OptNames[abs(MENU_MORE)].chars(), params[arg_bufferlen]); break; } case MPROP_EXITNAME: { - if (paramsNum < 4) + if (paramsNum < arg_bufferlen) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; } - set_amxstring(amx, params[3], pMenu->m_OptNames[abs(MENU_EXIT)].chars(), params[4]); + set_amxstring(amx, params[arg_buffer], pMenu->m_OptNames[abs(MENU_EXIT)].chars(), params[arg_bufferlen]); break; } case MPROP_TITLE: { - if (paramsNum < 4) + if (paramsNum < arg_bufferlen) { LogError(amx, AMX_ERR_NATIVE, "Expected 4 parameters"); return 0; } - set_amxstring(amx, params[3], pMenu->m_Title.chars(), params[4]); + set_amxstring(amx, params[arg_buffer], pMenu->m_Title.chars(), params[arg_bufferlen]); break; } case MPROP_EXITALL: { if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == false) + { return 1; + } else if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == true) + { return 2; + } else if(pMenu->m_NeverExit == true && pMenu->m_ForceExit == false) + { return -1; + } return 0; } @@ -1158,10 +1168,13 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) /* Ignored as of 1.8.0 */ break; } - case MPROP_NOCOLORS: return pMenu->m_AutoColors; + case MPROP_NOCOLORS: + { + return pMenu->m_AutoColors; + } default: { - LogError(amx, AMX_ERR_NATIVE, "Invalid menu setting: %d", params[1]); + LogError(amx, AMX_ERR_NATIVE, "Invalid menu setting: %d", params[arg_prop]); return 0; } } From a4be7ba033db8e935f6e1e3d2c5e6a75ae262461 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Mon, 10 Sep 2018 14:38:58 +0200 Subject: [PATCH 12/13] Fix spaces and convert bool to int --- amxmodx/newmenus.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index e5aba11c..d3a05850 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1086,7 +1086,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) int paramsNum = params[arg_numargs] / sizeof(cell); - switch(params[arg_prop]) + switch (params[arg_prop]) { case MPROP_PAGE_CALLBACK: return pMenu->pageCallback; case MPROP_SHOWPAGE: return pMenu->showPageNumber; @@ -1101,7 +1101,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) set_amxstring(amx, params[arg_buffer], pMenu->m_ItemColor.chars(), params[arg_bufferlen]); break; } - case MPROP_PERPAGE: return pMenu->items_per_page; + case MPROP_PERPAGE: return static_cast(pMenu->items_per_page); case MPROP_BACKNAME: { if (paramsNum < arg_bufferlen) @@ -1148,15 +1148,15 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_EXITALL: { - if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == false) + if (!pMenu->m_NeverExit && !pMenu->m_ForceExit) { return 1; } - else if(pMenu->m_NeverExit == false && pMenu->m_ForceExit == true) + else if (!pMenu->m_NeverExit && pMenu->m_ForceExit) { return 2; } - else if(pMenu->m_NeverExit == true && pMenu->m_ForceExit == false) + else if (pMenu->m_NeverExit && !pMenu->m_ForceExit) { return -1; } @@ -1170,7 +1170,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_NOCOLORS: { - return pMenu->m_AutoColors; + return static_cast(pMenu->m_AutoColors); } default: { From 0cf528fba0323a254b32a6090f24800814948cb0 Mon Sep 17 00:00:00 2001 From: OciXCrom Date: Mon, 10 Sep 2018 15:00:52 +0200 Subject: [PATCH 13/13] Inverse MPROP_NOCOLORS --- amxmodx/newmenus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp index d3a05850..9e2b13df 100755 --- a/amxmodx/newmenus.cpp +++ b/amxmodx/newmenus.cpp @@ -1170,7 +1170,7 @@ static cell AMX_NATIVE_CALL menu_getprop(AMX *amx, cell *params) } case MPROP_NOCOLORS: { - return static_cast(pMenu->m_AutoColors); + return static_cast(!pMenu->m_AutoColors); } default: {