Update spcomp and includes to latest 1.10-fork

disable warning 241: Array-based enum structs will be removed in 1.11
This commit is contained in:
BotoX
2024-06-21 06:55:55 +02:00
committed by zaCade
parent 689c4e89cf
commit 917ec936f8
72 changed files with 7755 additions and 6440 deletions
+126 -114
View File
@@ -9,7 +9,7 @@
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation.
*
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
@@ -29,7 +29,7 @@
*
* Version: $Id$
*/
#if defined _topmenus_included
#endinput
#endif
@@ -49,18 +49,18 @@ enum TopMenuAction
* OUTPUT: Buffer for rendering, maxlength of buffer.
*/
TopMenuAction_DisplayOption = 0,
/**
* The title of a menu is being drawn for a given topobj.
*
* Note: The Object ID will be INVALID_TOPMENUOBJECT if drawing the
* Note: The Object ID will be INVALID_TOPMENUOBJECT if drawing the
* root title. Otherwise, the Object ID is a category.
*
* INPUT : TopMenu Handle, topobj ID, client index.
* OUTPUT: Buffer for rendering, maxlength of buffer.
*/
TopMenuAction_DisplayTitle = 1,
/**
* A menu option has been selected.
*
@@ -74,19 +74,19 @@ enum TopMenuAction
* A menu option is being drawn and its flags can be overridden.
*
* INPUT : TopMenu Handle, topobj ID, client index.
* OUTPUT: The first byte of the 'buffer' string should be set
* to the desired flags. By default, it will contain
* ITEMDRAW_DEFAULT.
* OUTPUT: The first byte of the 'buffer' string should be set
* to the desired flags. By default, it will contain
* ITEMDRAW_DEFAULT.
*/
TopMenuAction_DrawOption = 3,
/**
* Called when an topobj is being removed from the menu.
* This can be used to clean up data stored in the info string.
*
* INPUT : TopMenu Handle, topobj ID.
*/
TopMenuAction_RemoveObject = 4,
TopMenuAction_RemoveObject = 4
};
/**
@@ -94,8 +94,8 @@ enum TopMenuAction
*/
enum TopMenuObjectType
{
TopMenuObject_Category = 0, /**< Category (sub-menu branching from root) */
TopMenuObject_Item = 1 /**< Item on a sub-menu */
TopMenuObject_Category = 0, /**< Category (sub-menu branching from root) */
TopMenuObject_Item = 1 /**< Item on a sub-menu */
};
/**
@@ -103,9 +103,9 @@ enum TopMenuObjectType
*/
enum TopMenuPosition
{
TopMenuPosition_Start = 0, /**< Start/root of the menu */
TopMenuPosition_LastRoot = 1, /**< Last position in the root menu */
TopMenuPosition_LastCategory = 3, /**< Last position in their last category */
TopMenuPosition_Start = 0, /**< Start/root of the menu */
TopMenuPosition_LastRoot = 1, /**< Last position in the root menu */
TopMenuPosition_LastCategory = 3 /**< Last position in their last category */
};
/**
@@ -113,21 +113,21 @@ enum TopMenuPosition
*/
enum TopMenuObject
{
INVALID_TOPMENUOBJECT = 0,
INVALID_TOPMENUOBJECT = 0
};
/**
* TopMenu callback prototype.
*
* @param topmenu Handle to the TopMenu.
* @param action TopMenuAction being performed.
* @param topobj_id The topobj ID (if used).
* @param param Extra parameter (if used).
* @param buffer Output buffer (if used).
* @param maxlength Output buffer (if used).
* @param topmenu Handle to the TopMenu.
* @param action TopMenuAction being performed.
* @param topobj_id The topobj ID (if used).
* @param param Extra parameter (if used).
* @param buffer Output buffer (if used).
* @param maxlength Output buffer (if used).
*/
typedef TopMenuHandler = function void (
TopMenu topmenu,
TopMenu topmenu,
TopMenuAction action,
TopMenuObject topobj_id,
int param,
@@ -152,18 +152,18 @@ methodmap TopMenu < Handle
// Re-sorts the items in a TopMenu via a configuration file.
//
// The format of the configuration file should be a Valve Key-Values
// formatted file that SourceMod can parse. There should be one root
// section, and one sub-section for each category. Each sub-section's
// The format of the configuration file should be a Valve Key-Values
// formatted file that SourceMod can parse. There should be one root
// section, and one sub-section for each category. Each sub-section's
// name should match the category name.
//
// Each sub-section may only contain key/value pairs in the form of:
// key: "item"
// value: Name of the item as passed to AddToTopMenu().
//
// The TopMenu will draw items in the order declared in the configuration
// file. If items do not appear in the configuration file, they are sorted
// per-player based on how the handler function renders for that player.
// The TopMenu will draw items in the order declared in the configuration
// file. If items do not appear in the configuration file, they are sorted
// per-player based on how the handler function renders for that player.
// These items appear after the configuration sorted items.
//
// @param topmenu TopMenu Handle.
@@ -172,79 +172,79 @@ methodmap TopMenu < Handle
// @param maxlength Maximum size of the error buffer. Error buffer
// will be filled with a zero-terminated string if
// false is returned.
// @return True on success, false on failure.
// @return True on success, false on failure.
public native bool LoadConfig(const char[] file, char[] error, int maxlength);
// Adds a category to a TopMenu.
//
//
// @param name Object name (MUST be unique).
// @param handler Handler for topobj.
// @param cmdname Command name (for access overrides).
// @param flags Default access flags.
// @param info_string Arbitrary storage (max 255 bytes).
// @return A new TopMenuObject ID, or INVALID_TOPMENUOBJECT on failure.
// @return A new TopMenuObject ID, or INVALID_TOPMENUOBJECT on failure.
public native TopMenuObject AddCategory(const char[] name, TopMenuHandler handler,
const char[] cmdname = "", int flags = 0,
const char[] info_string = "");
// Adds an item to a TopMenu category.
//
//
// @param name Object name (MUST be unique).
// @param handler Handler for topobj.
// @param category The object of the parent category for the item.
// @param cmdname Command name (for access overrides).
// @param flags Default access flags.
// @param info_string Arbitrary storage (max 255 bytes).
// @return A new TopMenuObject ID, or INVALID_TOPMENUOBJECT on failure.
// @return A new TopMenuObject ID, or INVALID_TOPMENUOBJECT on failure.
public native TopMenuObject AddItem(const char[] name, TopMenuHandler handler,
TopMenuObject parent, const char[] cmdname = "",
int flags = 0, const char[] info_string = "");
// Retrieves the info string of a top menu item.
//
//
// @param parent TopMenuObject ID.
// @param buffer Buffer to store info string.
// @param maxlength Maximum size of info string.
// @return Number of bytes written, not including the null terminator.
// @return Number of bytes written, not including the null terminator.
public native int GetInfoString(TopMenuObject parent, char[] buffer, int maxlength);
// Retrieves the name string of a top menu item.
//
//
// @param topobj TopMenuObject ID.
// @param buffer Buffer to store info string.
// @param maxlength Maximum size of info string.
// @return Number of bytes written, not including the null terminator.
// @return Number of bytes written, not including the null terminator.
public native int GetObjName(TopMenuObject topobj, char[] buffer, int maxlength);
// Removes an topobj from a TopMenu.
//
// Plugins' topobjs are automatically removed all TopMenus when the given
//
// Plugins' topobjs are automatically removed all TopMenus when the given
// plugin unloads or pauses. In the case of unpausing, all items are restored.
//
//
// @param topobj TopMenuObject ID.
public native void Remove(TopMenuObject topobj);
// Displays a TopMenu to a client.
//
//
// @param client Client index.
// @param position Position to display from.
// @return True on success, false on failure.
// @return True on success, false on failure.
public native bool Display(int client, TopMenuPosition position);
// Displays a TopMenu category to a client.
//
//
// @param category Category topobj id.
// @param client Client index.
// @return True on success, false on failure.
// @return True on success, false on failure.
public native bool DisplayCategory(TopMenuObject category, int client);
// Finds a category's topobj ID in a TopMenu.
//
//
// @param name Object's unique name.
// @return TopMenuObject ID on success, or
// @return TopMenuObject ID on success, or
// INVALID_TOPMENUOBJECT on failure.
public native TopMenuObject FindCategory(const char[] name);
// Set the menu title caching behavior of the TopMenu. By default titles
// 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.
@@ -256,56 +256,56 @@ methodmap TopMenu < Handle
/**
* Creates a TopMenu.
*
* @param handler Handler to use for drawing the root title.
* @return A new TopMenu Handle, or INVALID_HANDLE on failure.
*/
* @param handler Handler to use for drawing the root title.
* @return A new TopMenu Handle, or INVALID_HANDLE on failure.
*/
native TopMenu CreateTopMenu(TopMenuHandler handler);
/**
* Re-sorts the items in a TopMenu via a configuration file.
*
* The format of the configuration file should be a Valve Key-Values
* formatted file that SourceMod can parse. There should be one root
* section, and one sub-section for each category. Each sub-section's
* The format of the configuration file should be a Valve Key-Values
* formatted file that SourceMod can parse. There should be one root
* section, and one sub-section for each category. Each sub-section's
* name should match the category name.
*
* Each sub-section may only contain key/value pairs in the form of:
* key: "item"
* value: Name of the item as passed to AddToTopMenu().
*
* The TopMenu will draw items in the order declared in the configuration
* file. If items do not appear in the configuration file, they are sorted
* per-player based on how the handler function renders for that player.
* The TopMenu will draw items in the order declared in the configuration
* file. If items do not appear in the configuration file, they are sorted
* per-player based on how the handler function renders for that player.
* These items appear after the configuration sorted items.
*
* @param topmenu TopMenu Handle.
* @param file File path.
* @param error Error buffer.
* @param maxlength Maximum size of the error buffer.
* Error buffer will be filled with a
* zero-terminated string if false is
* returned.
* @return True on success, false on failure.
* @error Invalid TopMenu Handle.
* @param topmenu TopMenu Handle.
* @param file File path.
* @param error Error buffer.
* @param maxlength Maximum size of the error buffer.
* Error buffer will be filled with a
* zero-terminated string if false is
* returned.
* @return True on success, false on failure.
* @error Invalid TopMenu Handle.
*/
native bool LoadTopMenuConfig(Handle topmenu, const char[] file, char[] error, int maxlength);
/**
* Adds an topobj to a TopMenu.
*
* @param topmenu TopMenu Handle.
* @param name Object name (MUST be unique).
* @param type Object type.
* @param handler Handler for topobj.
* @param parent Parent topobj ID, or INVALID_TOPMENUOBJECT for none.
* Items must have a category parent.
* Categories must not have a parent.
* @param cmdname Command name (for access overrides).
* @param flags Default access flags.
* @param info_string Arbitrary storage (max 255 bytes).
* @return A new TopMenuObject ID, or INVALID_TOPMENUOBJECT on
* failure.
* @error Invalid TopMenu Handle.
* @param topmenu TopMenu Handle.
* @param name Object name (MUST be unique).
* @param type Object type.
* @param handler Handler for topobj.
* @param parent Parent topobj ID, or INVALID_TOPMENUOBJECT for none.
* Items must have a category parent.
* Categories must not have a parent.
* @param cmdname Command name (for access overrides).
* @param flags Default access flags.
* @param info_string Arbitrary storage (max 255 bytes).
* @return A new TopMenuObject ID, or INVALID_TOPMENUOBJECT on
* failure.
* @error Invalid TopMenu Handle.
*/
native TopMenuObject AddToTopMenu(Handle topmenu,
const char[] name,
@@ -315,75 +315,75 @@ native TopMenuObject AddToTopMenu(Handle topmenu,
const char[] cmdname="",
int flags=0,
const char[] info_string="");
/**
* Retrieves the info string of a top menu item.
*
* @param topmenu TopMenu Handle.
* @param parent TopMenuObject ID.
* @param buffer Buffer to store info string.
* @param maxlength Maximum size of info string.
* @return Number of bytes written, not including the
* null terminator.
* @error Invalid TopMenu Handle or TopMenuObject ID.
* @param topmenu TopMenu Handle.
* @param parent TopMenuObject ID.
* @param buffer Buffer to store info string.
* @param maxlength Maximum size of info string.
* @return Number of bytes written, not including the
* null terminator.
* @error Invalid TopMenu Handle or TopMenuObject ID.
*/
native int GetTopMenuInfoString(Handle topmenu, TopMenuObject parent, char[] buffer, int maxlength);
/**
* Retrieves the name string of a top menu item.
*
* @param topmenu TopMenu Handle.
* @param topobj TopMenuObject ID.
* @param buffer Buffer to store info string.
* @param maxlength Maximum size of info string.
* @return Number of bytes written, not including the
* null terminator.
* @error Invalid TopMenu Handle or TopMenuObject ID.
* @param topmenu TopMenu Handle.
* @param topobj TopMenuObject ID.
* @param buffer Buffer to store info string.
* @param maxlength Maximum size of info string.
* @return Number of bytes written, not including the
* null terminator.
* @error Invalid TopMenu Handle or TopMenuObject ID.
*/
native int GetTopMenuObjName(Handle topmenu, TopMenuObject topobj, char[] buffer, int maxlength);
/**
* Removes an topobj from a TopMenu.
*
* Plugins' topobjs are automatically removed all TopMenus when the given
* Plugins' topobjs are automatically removed all TopMenus when the given
* plugin unloads or pauses. In the case of unpausing, all items are restored.
*
* @param topmenu TopMenu Handle.
* @param topobj TopMenuObject ID.
* @error Invalid TopMenu Handle.
* @param topmenu TopMenu Handle.
* @param topobj TopMenuObject ID.
* @error Invalid TopMenu Handle.
*/
native void RemoveFromTopMenu(Handle topmenu, TopMenuObject topobj);
/**
* Displays a TopMenu to a client.
*
* @param topmenu TopMenu Handle.
* @param client Client index.
* @param position Position to display from.
* @return True on success, false on failure.
* @error Invalid TopMenu Handle or client not in game.
* @param topmenu TopMenu Handle.
* @param client Client index.
* @param position Position to display from.
* @return True on success, false on failure.
* @error Invalid TopMenu Handle or client not in game.
*/
native bool DisplayTopMenu(Handle topmenu, int client, TopMenuPosition position);
/**
* Displays a TopMenu category to a client.
*
* @param topmenu TopMenu Handle.
* @param category Category topobj id.
* @param client Client index.
* @return True on success, false on failure.
* @error Invalid TopMenu Handle or client not in game.
* @param topmenu TopMenu Handle.
* @param category Category topobj id.
* @param client Client index.
* @return True on success, false on failure.
* @error Invalid TopMenu Handle or client not in game.
*/
native bool DisplayTopMenuCategory(Handle topmenu, TopMenuObject category, int client);
/**
* Finds a category's topobj ID in a TopMenu.
*
* @param topmenu TopMenu Handle.
* @param name Object's unique name.
* @return TopMenuObject ID on success, or
* INVALID_TOPMENUOBJECT on failure.
* @error Invalid TopMenu Handle.
* @param topmenu TopMenu Handle.
* @param name Object's unique name.
* @return TopMenuObject ID on success, or
* INVALID_TOPMENUOBJECT on failure.
* @error Invalid TopMenu Handle.
*/
native TopMenuObject FindTopMenuCategory(Handle topmenu, const char[] name);
@@ -403,7 +403,7 @@ native void SetTopMenuTitleCaching(Handle topmenu, bool cache_titles);
/**
* Do not edit below this line!
*/
public Extension __ext_topmenus =
public Extension __ext_topmenus =
{
name = "TopMenus",
file = "topmenus.ext",
@@ -430,5 +430,17 @@ public void __ext_topmenus_SetNTVOptional()
MarkNativeAsOptional("DisplayTopMenuCategory");
MarkNativeAsOptional("FindTopMenuCategory");
MarkNativeAsOptional("SetTopMenuTitleCaching");
MarkNativeAsOptional("TopMenu.TopMenu");
MarkNativeAsOptional("TopMenu.FromHandle");
MarkNativeAsOptional("TopMenu.LoadConfig");
MarkNativeAsOptional("TopMenu.AddCategory");
MarkNativeAsOptional("TopMenu.AddItem");
MarkNativeAsOptional("TopMenu.GetInfoString");
MarkNativeAsOptional("TopMenu.GetObjName");
MarkNativeAsOptional("TopMenu.Remove");
MarkNativeAsOptional("TopMenu.Display");
MarkNativeAsOptional("TopMenu.DisplayCategory");
MarkNativeAsOptional("TopMenu.FindCategory");
MarkNativeAsOptional("TopMenu.CacheTitles.set");
}
#endif