mirror of
https://github.com/alliedmodders/sourcemod.git
synced 2025-12-07 02:18:35 +00:00
Merge 3a68eeba42 into 1819f491b5
This commit is contained in:
commit
16ead392eb
@ -1244,6 +1244,18 @@ unsigned int TopMenu::FindCategory(const char *name)
|
|||||||
return obj->object_id;
|
return obj->object_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsigned int TopMenu::FindItem(const char *name)
|
||||||
|
{
|
||||||
|
topmenu_object_t *obj;
|
||||||
|
if (!m_ObjLookup.retrieve(name, &obj))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (obj->type != TopMenuObject_Item)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return obj->object_id;
|
||||||
|
}
|
||||||
|
|
||||||
void TopMenu::OnMaxPlayersChanged( int newvalue )
|
void TopMenu::OnMaxPlayersChanged( int newvalue )
|
||||||
{
|
{
|
||||||
m_max_clients = newvalue;
|
m_max_clients = newvalue;
|
||||||
|
|||||||
@ -142,6 +142,7 @@ public: //ITopMenu
|
|||||||
TopMenuPosition position);
|
TopMenuPosition position);
|
||||||
virtual bool LoadConfiguration(const char *file, char *error, size_t maxlength);
|
virtual bool LoadConfiguration(const char *file, char *error, size_t maxlength);
|
||||||
virtual unsigned int FindCategory(const char *name);
|
virtual unsigned int FindCategory(const char *name);
|
||||||
|
virtual unsigned int FindItem(const char *name);
|
||||||
const char *GetObjectInfoString(unsigned int object_id);
|
const char *GetObjectInfoString(unsigned int object_id);
|
||||||
const char *GetObjectName(unsigned int object_id);
|
const char *GetObjectName(unsigned int object_id);
|
||||||
public: //IMenuHandler
|
public: //IMenuHandler
|
||||||
|
|||||||
@ -300,6 +300,24 @@ static cell_t FindTopMenuCategory(IPluginContext *pContext, const cell_t *params
|
|||||||
return pMenu->FindCategory(name);
|
return pMenu->FindCategory(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static cell_t FindTopMenuItem(IPluginContext *pContext, const cell_t *params)
|
||||||
|
{
|
||||||
|
HandleError err;
|
||||||
|
ITopMenu *pMenu;
|
||||||
|
HandleSecurity sec(pContext->GetIdentity(), myself->GetIdentity());
|
||||||
|
|
||||||
|
if ((err = handlesys->ReadHandle(params[1], hTopMenuType, &sec, (void **)&pMenu))
|
||||||
|
!= HandleError_None)
|
||||||
|
{
|
||||||
|
return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *name;
|
||||||
|
pContext->LocalToString(params[2], &name);
|
||||||
|
|
||||||
|
return pMenu->FindItem(name);
|
||||||
|
}
|
||||||
|
|
||||||
static cell_t DisplayTopMenu(IPluginContext *pContext, const cell_t *params)
|
static cell_t DisplayTopMenu(IPluginContext *pContext, const cell_t *params)
|
||||||
{
|
{
|
||||||
HandleError err;
|
HandleError err;
|
||||||
@ -486,6 +504,7 @@ sp_nativeinfo_t g_TopMenuNatives[] =
|
|||||||
{"TopMenu.LoadConfig", LoadTopMenuConfig},
|
{"TopMenu.LoadConfig", LoadTopMenuConfig},
|
||||||
{"TopMenu.Remove", RemoveFromTopMenu},
|
{"TopMenu.Remove", RemoveFromTopMenu},
|
||||||
{"TopMenu.FindCategory", FindTopMenuCategory},
|
{"TopMenu.FindCategory", FindTopMenuCategory},
|
||||||
|
{"TopMenu.FindItem", FindTopMenuItem},
|
||||||
{"TopMenu.GetInfoString", GetTopMenuInfoString},
|
{"TopMenu.GetInfoString", GetTopMenuInfoString},
|
||||||
{"TopMenu.GetObjName", GetTopMenuName},
|
{"TopMenu.GetObjName", GetTopMenuName},
|
||||||
{"TopMenu.CacheTitles.set", SetTopMenuTitleCaching},
|
{"TopMenu.CacheTitles.set", SetTopMenuTitleCaching},
|
||||||
|
|||||||
@ -245,6 +245,13 @@ methodmap TopMenu < Handle
|
|||||||
// INVALID_TOPMENUOBJECT on failure.
|
// INVALID_TOPMENUOBJECT on failure.
|
||||||
public native TopMenuObject FindCategory(const char[] name);
|
public native TopMenuObject FindCategory(const char[] name);
|
||||||
|
|
||||||
|
// Finds an item's topobj ID in a TopMenu.
|
||||||
|
//
|
||||||
|
// @param name Object's unique name.
|
||||||
|
// @return TopMenuObject ID on success, or
|
||||||
|
// INVALID_TOPMENUOBJECT on failure.
|
||||||
|
public native TopMenuObject FindItem(const char[] name);
|
||||||
|
|
||||||
// Set the menu title caching behavior of the TopMenu. By default titles
|
// Set the menu title caching behavior of the TopMenu. By default titles
|
||||||
// are cached to reduce overhead. If you need dynamic menu titles which
|
// are cached to reduce overhead. If you need dynamic menu titles which
|
||||||
// change each time the menu is displayed to a user, set this to false.
|
// change each time the menu is displayed to a user, set this to false.
|
||||||
@ -441,6 +448,7 @@ public void __ext_topmenus_SetNTVOptional()
|
|||||||
MarkNativeAsOptional("TopMenu.Display");
|
MarkNativeAsOptional("TopMenu.Display");
|
||||||
MarkNativeAsOptional("TopMenu.DisplayCategory");
|
MarkNativeAsOptional("TopMenu.DisplayCategory");
|
||||||
MarkNativeAsOptional("TopMenu.FindCategory");
|
MarkNativeAsOptional("TopMenu.FindCategory");
|
||||||
|
MarkNativeAsOptional("TopMenu.FindItem");
|
||||||
MarkNativeAsOptional("TopMenu.CacheTitles.set");
|
MarkNativeAsOptional("TopMenu.CacheTitles.set");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user