teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Fix order of CDECL

Browse source
This commit is contained in:
Koncord 2019-01-03 03:01:09 +08:00
parent 7bbf81b74d
commit e766c6fb01
18 changed files with 108 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/openmw-mp/Script/Functions/Actors.hpp
View file

@ -153,14 +153,14 @@ namespace ActorFunctions
* *
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetActorListSize() noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetActorListSize() noexcept;
/** /**
* \brief Get the action type used in the read actor list. * \brief Get the action type used in the read actor list.
* *
* \return The action type (0 for SET, 1 for ADD, 2 for REMOVE, 3 for REQUEST). * \return The action type (0 for SET, 1 for ADD, 2 for REMOVE, 3 for REQUEST).
*/ */
EXPORT_APIFUNCTION unsigned CDECL char GetActorListAction() noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetActorListAction() noexcept;
/** /**
* \brief Get the cell description of the actor at a certain index in the read actor list. * \brief Get the cell description of the actor at a certain index in the read actor list.
@ -168,7 +168,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The cell description. * \return The cell description.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetActorCell(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetActorCell(unsigned int index) noexcept;
/** /**
* \brief Get the refId of the actor at a certain index in the read actor list. * \brief Get the refId of the actor at a certain index in the read actor list.
@ -176,7 +176,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetActorRefId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetActorRefId(unsigned int index) noexcept;
/** /**
* \brief Get the refNum of the actor at a certain index in the read actor list. * \brief Get the refNum of the actor at a certain index in the read actor list.
@ -184,7 +184,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The refNum. * \return The refNum.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetActorRefNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetActorRefNum(unsigned int index) noexcept;
/** /**
* \brief Get the mpNum of the actor at a certain index in the read actor list. * \brief Get the mpNum of the actor at a certain index in the read actor list.
@ -192,7 +192,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The mpNum. * \return The mpNum.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetActorMpNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetActorMpNum(unsigned int index) noexcept;
/** /**
* \brief Get the X position of the actor at a certain index in the read actor list. * \brief Get the X position of the actor at a certain index in the read actor list.
@ -322,7 +322,7 @@ namespace ActorFunctions
* \param slot The slot of the equipment item. * \param slot The slot of the equipment item.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetActorEquipmentItemRefId(unsigned int index, unsigned short slot) noexcept; EXPORT_APIFUNCTION const char *CDECL GetActorEquipmentItemRefId(unsigned int index, unsigned short slot) noexcept;
/** /**
* \brief Get the count of the item in a certain slot of the equipment of the actor at a * \brief Get the count of the item in a certain slot of the equipment of the actor at a
@ -376,7 +376,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The refId of the killer. * \return The refId of the killer.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetActorKillerRefId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetActorKillerRefId(unsigned int index) noexcept;
/** /**
* \brief Get the refNum of the actor killer of the actor at a certain index in the read actor list. * \brief Get the refNum of the actor killer of the actor at a certain index in the read actor list.
@ -384,7 +384,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The refNum of the killer. * \return The refNum of the killer.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetActorKillerRefNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetActorKillerRefNum(unsigned int index) noexcept;
/** /**
* \brief Get the mpNum of the actor killer of the actor at a certain index in the read actor list. * \brief Get the mpNum of the actor killer of the actor at a certain index in the read actor list.
@ -392,7 +392,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The mpNum of the killer. * \return The mpNum of the killer.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetActorKillerMpNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetActorKillerMpNum(unsigned int index) noexcept;
/** /**
* \brief Get the name of the actor killer of the actor at a certain index in the read actor list. * \brief Get the name of the actor killer of the actor at a certain index in the read actor list.
@ -400,7 +400,7 @@ namespace ActorFunctions
* \param index The index of the actor. * \param index The index of the actor.
* \return The name of the killer. * \return The name of the killer.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetActorKillerName(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetActorKillerName(unsigned int index) noexcept;
/** /**
* \brief Check whether there is any positional data for the actor at a certain index in * \brief Check whether there is any positional data for the actor at a certain index in
@ -771,8 +771,8 @@ namespace ActorFunctions
EXPORT_APIFUNCTION void CDECL ReadLastActorList() noexcept; EXPORT_APIFUNCTION void CDECL ReadLastActorList() noexcept;
EXPORT_APIFUNCTION void CDECL InitializeActorList(unsigned short pid) noexcept; EXPORT_APIFUNCTION void CDECL InitializeActorList(unsigned short pid) noexcept;
EXPORT_APIFUNCTION void CDECL CopyLastActorListToStore() noexcept; EXPORT_APIFUNCTION void CDECL CopyLastActorListToStore() noexcept;
EXPORT_APIFUNCTION unsigned CDECL int GetActorRefNumIndex(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetActorRefNumIndex(unsigned int index) noexcept;
EXPORT_APIFUNCTION unsigned CDECL int GetActorKillerRefNumIndex(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetActorKillerRefNumIndex(unsigned int index) noexcept;
EXPORT_APIFUNCTION void CDECL SetActorRefNumIndex(int refNum) noexcept; EXPORT_APIFUNCTION void CDECL SetActorRefNumIndex(int refNum) noexcept;
} }

4
apps/openmw-mp/Script/Functions/Books.hpp
View file

@ -35,7 +35,7 @@ namespace BookFunctions
* \param pid The player ID whose book changes should be used. * \param pid The player ID whose book changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetBookChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetBookChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Add a new book to the book changes for a player. * \brief Add a new book to the book changes for a player.
@ -53,7 +53,7 @@ namespace BookFunctions
* \param index The index of the book. * \param index The index of the book.
* \return The bookId. * \return The bookId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetBookId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetBookId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Send a PlayerBook packet with a player's recorded book changes. * \brief Send a PlayerBook packet with a player's recorded book changes.

10
apps/openmw-mp/Script/Functions/Cells.hpp
View file

@ -33,7 +33,7 @@ namespace CellFunctions
* \param pid The player ID whose cell state changes should be used. * \param pid The player ID whose cell state changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetCellStateChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetCellStateChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Get the cell state type at a certain index in a player's latest cell state changes. * \brief Get the cell state type at a certain index in a player's latest cell state changes.
@ -42,7 +42,7 @@ namespace CellFunctions
* \param index The index of the cell state. * \param index The index of the cell state.
* \return The cell state type (0 for LOAD, 1 for UNLOAD). * \return The cell state type (0 for LOAD, 1 for UNLOAD).
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetCellStateType(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetCellStateType(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the cell description at a certain index in a player's latest cell state changes. * \brief Get the cell description at a certain index in a player's latest cell state changes.
@ -51,7 +51,7 @@ namespace CellFunctions
* \param index The index of the cell state. * \param index The index of the cell state.
* \return The cell description. * \return The cell description.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetCellStateDescription(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetCellStateDescription(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the cell description of a player's cell. * \brief Get the cell description of a player's cell.
@ -59,7 +59,7 @@ namespace CellFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The cell description. * \return The cell description.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetCell(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetCell(unsigned short pid) noexcept;
/** /**
* \brief Get the X coordinate of the player's exterior cell. * \brief Get the X coordinate of the player's exterior cell.
@ -93,7 +93,7 @@ namespace CellFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The region. * \return The region.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRegion(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRegion(unsigned short pid) noexcept;
/** /**
* \brief Check whether the player's last cell change has involved a region change. * \brief Check whether the player's last cell change has involved a region change.

6
apps/openmw-mp/Script/Functions/CharClass.hpp
View file

@ -38,7 +38,7 @@ namespace CharClassFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The ID of the default class. * \return The ID of the default class.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetDefaultClass(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetDefaultClass(unsigned short pid) noexcept;
/** /**
* \brief Get the name of the custom class used by a player. * \brief Get the name of the custom class used by a player.
@ -46,7 +46,7 @@ namespace CharClassFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The name of the custom class. * \return The name of the custom class.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetClassName(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetClassName(unsigned short pid) noexcept;
/** /**
* \brief Get the description of the custom class used by a player. * \brief Get the description of the custom class used by a player.
@ -54,7 +54,7 @@ namespace CharClassFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The description of the custom class. * \return The description of the custom class.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetClassDesc(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetClassDesc(unsigned short pid) noexcept;
/** /**
* \brief Get the ID of one of the two major attributes of a custom class used by a player. * \brief Get the ID of one of the two major attributes of a custom class used by a player.

4
apps/openmw-mp/Script/Functions/Dialogue.hpp
View file

@ -37,7 +37,7 @@ namespace DialogueFunctions
* \param pid The player ID whose topic changes should be used. * \param pid The player ID whose topic changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetTopicChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetTopicChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Add a new topic to the topic changes for a player. * \brief Add a new topic to the topic changes for a player.
@ -55,7 +55,7 @@ namespace DialogueFunctions
* \param index The index of the topic. * \param index The index of the topic.
* \return The topicId. * \return The topicId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetTopicId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetTopicId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Send a PlayerTopic packet with a player's recorded topic changes. * \brief Send a PlayerTopic packet with a player's recorded topic changes.

6
apps/openmw-mp/Script/Functions/Factions.hpp
View file

@ -44,7 +44,7 @@ namespace FactionFunctions
* \param pid The player ID whose faction changes should be used. * \param pid The player ID whose faction changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetFactionChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetFactionChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Get the action type used in a player's latest faction changes. * \brief Get the action type used in a player's latest faction changes.
@ -52,7 +52,7 @@ namespace FactionFunctions
* \param pid The player ID whose faction changes should be used. * \param pid The player ID whose faction changes should be used.
* \return The action type (0 for RANK, 1 for EXPULSION, 2 for REPUTATION). * \return The action type (0 for RANK, 1 for EXPULSION, 2 for REPUTATION).
*/ */
EXPORT_APIFUNCTION unsigned CDECL char GetFactionChangesAction(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetFactionChangesAction(unsigned short pid) noexcept;
/** /**
* \brief Get the factionId at a certain index in a player's latest faction changes. * \brief Get the factionId at a certain index in a player's latest faction changes.
@ -61,7 +61,7 @@ namespace FactionFunctions
* \param index The index of the faction. * \param index The index of the faction.
* \return The factionId. * \return The factionId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetFactionId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetFactionId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the rank at a certain index in a player's latest faction changes. * \brief Get the rank at a certain index in a player's latest faction changes.

4
apps/openmw-mp/Script/Functions/GUI.hpp
View file

@ -109,7 +109,7 @@ namespace GUIFunctions
* \param pid The player ID whose quick key changes should be used. * \param pid The player ID whose quick key changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetQuickKeyChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetQuickKeyChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Add a new quick key to the quick key changes for a player. * \brief Add a new quick key to the quick key changes for a player.
@ -147,7 +147,7 @@ namespace GUIFunctions
* \param index The index of the quick key in the quick key changes vector. * \param index The index of the quick key in the quick key changes vector.
* \return The itemId. * \return The itemId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetQuickKeyItemId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetQuickKeyItemId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Send a PlayerQuickKeys packet with a player's recorded quick key changes. * \brief Send a PlayerQuickKeys packet with a player's recorded quick key changes.

14
apps/openmw-mp/Script/Functions/Items.hpp
View file

@ -70,7 +70,7 @@ namespace ItemFunctions
* \param pid The player ID whose inventory changes should be used. * \param pid The player ID whose inventory changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetInventoryChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetInventoryChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Get the action type used in a player's latest inventory changes. * \brief Get the action type used in a player's latest inventory changes.
@ -78,7 +78,7 @@ namespace ItemFunctions
* \param pid The player ID whose inventory changes should be used. * \param pid The player ID whose inventory changes should be used.
* \return The action type (0 for SET, 1 for ADD, 2 for REMOVE). * \return The action type (0 for SET, 1 for ADD, 2 for REMOVE).
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetInventoryChangesAction(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetInventoryChangesAction(unsigned short pid) noexcept;
/** /**
* \brief Set the action type in a player's inventory changes. * \brief Set the action type in a player's inventory changes.
@ -142,7 +142,7 @@ namespace ItemFunctions
* \param slot The slot of the equipment item. * \param slot The slot of the equipment item.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetEquipmentItemRefId(unsigned short pid, unsigned short slot) noexcept; EXPORT_APIFUNCTION const char *CDECL GetEquipmentItemRefId(unsigned short pid, unsigned short slot) noexcept;
/** /**
* \brief Get the count of the item in a certain slot of the equipment of a player. * \brief Get the count of the item in a certain slot of the equipment of a player.
@ -180,7 +180,7 @@ namespace ItemFunctions
* \param index The index of the inventory item. * \param index The index of the inventory item.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetInventoryItemRefId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetInventoryItemRefId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the count of the item at a certain index in a player's latest inventory * \brief Get the count of the item at a certain index in a player's latest inventory
@ -220,7 +220,7 @@ namespace ItemFunctions
* \param index The index of the inventory item. * \param index The index of the inventory item.
* \return The soul. * \return The soul.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetInventoryItemSoul(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetInventoryItemSoul(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the refId of the item last used by a player. * \brief Get the refId of the item last used by a player.
@ -228,7 +228,7 @@ namespace ItemFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetUsedItemRefId(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetUsedItemRefId(unsigned short pid) noexcept;
/** /**
* \brief Get the count of the item last used by a player. * \brief Get the count of the item last used by a player.
@ -260,7 +260,7 @@ namespace ItemFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The soul. * \return The soul.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetUsedItemSoul(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetUsedItemSoul(unsigned short pid) noexcept;
/** /**
* \brief Send a PlayerEquipment packet with a player's equipment. * \brief Send a PlayerEquipment packet with a player's equipment.

20
apps/openmw-mp/Script/Functions/Mechanics.hpp
View file

@ -48,7 +48,7 @@ namespace MechanicsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The type. * \return The type.
*/ */
EXPORT_APIFUNCTION unsigned CDECL char GetMiscellaneousChangeType(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetMiscellaneousChangeType(unsigned short pid) noexcept;
/** /**
* \brief Get the cell description of a player's Mark cell. * \brief Get the cell description of a player's Mark cell.
@ -56,7 +56,7 @@ namespace MechanicsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The cell description. * \return The cell description.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetMarkCell(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetMarkCell(unsigned short pid) noexcept;
/** /**
* \brief Get the X position of a player's Mark. * \brief Get the X position of a player's Mark.
@ -104,7 +104,7 @@ namespace MechanicsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The spell ID. * \return The spell ID.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetSelectedSpellId(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetSelectedSpellId(unsigned short pid) noexcept;
/** /**
* \brief Check whether the killer of a certain player is also a player. * \brief Check whether the killer of a certain player is also a player.
@ -128,7 +128,7 @@ namespace MechanicsFunctions
* \param pid The player ID of the killed player. * \param pid The player ID of the killed player.
* \return The refId of the killer. * \return The refId of the killer.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetPlayerKillerRefId(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetPlayerKillerRefId(unsigned short pid) noexcept;
/** /**
* \brief Get the refNum of the actor killer of a certain player. * \brief Get the refNum of the actor killer of a certain player.
@ -136,7 +136,7 @@ namespace MechanicsFunctions
* \param pid The player ID of the killed player. * \param pid The player ID of the killed player.
* \return The refNum of the killer. * \return The refNum of the killer.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetPlayerKillerRefNum(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetPlayerKillerRefNum(unsigned short pid) noexcept;
/** /**
* \brief Get the mpNum of the actor killer of a certain player. * \brief Get the mpNum of the actor killer of a certain player.
@ -144,7 +144,7 @@ namespace MechanicsFunctions
* \param pid The player ID of the killed player. * \param pid The player ID of the killed player.
* \return The mpNum of the killer. * \return The mpNum of the killer.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetPlayerKillerMpNum(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetPlayerKillerMpNum(unsigned short pid) noexcept;
/** /**
* \brief Get the name of the actor killer of a certain player. * \brief Get the name of the actor killer of a certain player.
@ -152,7 +152,7 @@ namespace MechanicsFunctions
* \param pid The player ID of the killed player. * \param pid The player ID of the killed player.
* \return The name of the killer. * \return The name of the killer.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetPlayerKillerName(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetPlayerKillerName(unsigned short pid) noexcept;
/** /**
* \brief Get the draw state of a player (0 for nothing, 1 for drawn weapon, * \brief Get the draw state of a player (0 for nothing, 1 for drawn weapon,
@ -161,7 +161,7 @@ namespace MechanicsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The draw state. * \return The draw state.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetDrawState(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetDrawState(unsigned short pid) noexcept;
/** /**
* \brief Get the sneak state of a player. * \brief Get the sneak state of a player.
@ -278,8 +278,8 @@ namespace MechanicsFunctions
// All methods below are deprecated versions of methods from above // All methods below are deprecated versions of methods from above
EXPORT_APIFUNCTION const CDECL char *GetDeathReason(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetDeathReason(unsigned short pid) noexcept;
EXPORT_APIFUNCTION unsigned CDECL int GetPlayerKillerRefNumIndex(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetPlayerKillerRefNumIndex(unsigned short pid) noexcept;
} }
#endif //OPENMW_MECHANICSAPI_HPP #endif //OPENMW_MECHANICSAPI_HPP

4
apps/openmw-mp/Script/Functions/Miscellaneous.hpp
View file

@ -38,7 +38,7 @@ namespace MiscellaneousFunctions
* *
* \return The filename that matches. * \return The filename that matches.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetCaseInsensitiveFilename(const char *folderPath, const char *filename) noexcept; EXPORT_APIFUNCTION const char *CDECL GetCaseInsensitiveFilename(const char *folderPath, const char *filename) noexcept;
/** /**
* \brief Get the last player ID currently connected to the server. * \brief Get the last player ID currently connected to the server.
@ -48,7 +48,7 @@ namespace MiscellaneousFunctions
* *
* \return The player ID. * \return The player ID.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetLastPlayerId() noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetLastPlayerId() noexcept;
/** /**
* \brief Get the current (latest) mpNum generated by the server. * \brief Get the current (latest) mpNum generated by the server.

50
apps/openmw-mp/Script/Functions/Objects.hpp
View file

@ -176,7 +176,7 @@ namespace ObjectFunctions
* *
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetObjectListSize() noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectListSize() noexcept;
/** /**
* \brief Get the origin of the read object list. * \brief Get the origin of the read object list.
@ -185,7 +185,7 @@ namespace ObjectFunctions
* CLIENT_DIALOGUE, 3 for CLIENT_SCRIPT_LOCAL, 4 for CLIENT_SCRIPT_GLOBAL, * CLIENT_DIALOGUE, 3 for CLIENT_SCRIPT_LOCAL, 4 for CLIENT_SCRIPT_GLOBAL,
* 5 for SERVER_SCRIPT). * 5 for SERVER_SCRIPT).
*/ */
EXPORT_APIFUNCTION unsigned CDECL char GetObjectListOrigin() noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetObjectListOrigin() noexcept;
/** /**
* \brief Get the client script that the read object list originated from. * \brief Get the client script that the read object list originated from.
@ -194,21 +194,21 @@ namespace ObjectFunctions
* *
* \return The ID of the client script. * \return The ID of the client script.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetObjectListClientScript() noexcept; EXPORT_APIFUNCTION const char *CDECL GetObjectListClientScript() noexcept;
/** /**
* \brief Get the action type used in the read object list. * \brief Get the action type used in the read object list.
* *
* \return The action type (0 for SET, 1 for ADD, 2 for REMOVE, 3 for REQUEST). * \return The action type (0 for SET, 1 for ADD, 2 for REMOVE, 3 for REQUEST).
*/ */
EXPORT_APIFUNCTION unsigned CDECL char GetObjectListAction() noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetObjectListAction() noexcept;
/** /**
* \brief Get the container subaction type used in the read object list. * \brief Get the container subaction type used in the read object list.
* *
* \return The action type (0 for NONE, 1 for DRAG, 2 for DROP, 3 for TAKE_ALL). * \return The action type (0 for NONE, 1 for DRAG, 2 for DROP, 3 for TAKE_ALL).
*/ */
EXPORT_APIFUNCTION unsigned CDECL char GetObjectListContainerSubAction() noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetObjectListContainerSubAction() noexcept;
/** /**
* \brief Check whether the object at a certain index in the read object list is a * \brief Check whether the object at a certain index in the read object list is a
@ -241,7 +241,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetObjectRefId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetObjectRefId(unsigned int index) noexcept;
/** /**
* \brief Get the refNum of the object at a certain index in the read object list. * \brief Get the refNum of the object at a certain index in the read object list.
@ -249,7 +249,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The refNum. * \return The refNum.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetObjectRefNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectRefNum(unsigned int index) noexcept;
/** /**
* \brief Get the mpNum of the object at a certain index in the read object list. * \brief Get the mpNum of the object at a certain index in the read object list.
@ -257,7 +257,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The mpNum. * \return The mpNum.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetObjectMpNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectMpNum(unsigned int index) noexcept;
/** /**
* \brief Get the count of the object at a certain index in the read object list. * \brief Get the count of the object at a certain index in the read object list.
@ -289,7 +289,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The soul. * \return The soul.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetObjectSoul(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetObjectSoul(unsigned int index) noexcept;
/** /**
* \brief Get the gold value of the object at a certain index in the read object list. * \brief Get the gold value of the object at a certain index in the read object list.
@ -358,7 +358,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The refId of the activating actor. * \return The refId of the activating actor.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetObjectActivatingRefId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetObjectActivatingRefId(unsigned int index) noexcept;
/** /**
* \brief Get the refNum of the actor activating the object at a certain index in the read * \brief Get the refNum of the actor activating the object at a certain index in the read
@ -367,7 +367,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The refNum of the activating actor. * \return The refNum of the activating actor.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetObjectActivatingRefNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectActivatingRefNum(unsigned int index) noexcept;
/** /**
* \brief Get the mpNum of the actor activating the object at a certain index in the read * \brief Get the mpNum of the actor activating the object at a certain index in the read
@ -376,7 +376,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The mpNum of the activating actor. * \return The mpNum of the activating actor.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetObjectActivatingMpNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectActivatingMpNum(unsigned int index) noexcept;
/** /**
* \brief Get the name of the actor activating the object at a certain index in the read * \brief Get the name of the actor activating the object at a certain index in the read
@ -385,7 +385,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The name of the activating actor. * \return The name of the activating actor.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetObjectActivatingName(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetObjectActivatingName(unsigned int index) noexcept;
/** /**
* \brief Check whether the object at a certain index in the read object list is a * \brief Check whether the object at a certain index in the read object list is a
@ -434,7 +434,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The refId of the summoner. * \return The refId of the summoner.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetObjectSummonerRefId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetObjectSummonerRefId(unsigned int index) noexcept;
/** /**
* \brief Get the refNum of the actor summoner of the object at a certain index in the read object * \brief Get the refNum of the actor summoner of the object at a certain index in the read object
@ -443,7 +443,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The refNum of the summoner. * \return The refNum of the summoner.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetObjectSummonerRefNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectSummonerRefNum(unsigned int index) noexcept;
/** /**
* \brief Get the mpNum of the actor summoner of the object at a certain index in the read object list. * \brief Get the mpNum of the actor summoner of the object at a certain index in the read object list.
@ -451,7 +451,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The mpNum of the summoner. * \return The mpNum of the summoner.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetObjectSummonerMpNum(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectSummonerMpNum(unsigned int index) noexcept;
/** /**
* \brief Get the X position of the object at a certain index in the read object list. * \brief Get the X position of the object at a certain index in the read object list.
@ -506,7 +506,7 @@ namespace ObjectFunctions
* *
* \return The videoFilename. * \return The videoFilename.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetVideoFilename(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetVideoFilename(unsigned int index) noexcept;
/** /**
* \brief Get the number of container item indexes of the object at a certain index in the * \brief Get the number of container item indexes of the object at a certain index in the
@ -515,7 +515,7 @@ namespace ObjectFunctions
* \param index The index of the object. * \param index The index of the object.
* \return The number of container item indexes. * \return The number of container item indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetContainerChangesSize(unsigned int objectIndex) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetContainerChangesSize(unsigned int objectIndex) noexcept;
/** /**
* \brief Get the refId of the container item at a certain itemIndex in the container changes * \brief Get the refId of the container item at a certain itemIndex in the container changes
@ -525,7 +525,7 @@ namespace ObjectFunctions
* \param itemIndex The index of the container item. * \param itemIndex The index of the container item.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetContainerItemRefId(unsigned int objectIndex, unsigned int itemIndex) noexcept; EXPORT_APIFUNCTION const char *CDECL GetContainerItemRefId(unsigned int objectIndex, unsigned int itemIndex) noexcept;
/** /**
* \brief Get the item count of the container item at a certain itemIndex in the container * \brief Get the item count of the container item at a certain itemIndex in the container
@ -565,7 +565,7 @@ namespace ObjectFunctions
* \param itemIndex The index of the container item. * \param itemIndex The index of the container item.
* \return The soul. * \return The soul.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetContainerItemSoul(unsigned int objectIndex, unsigned int itemIndex) noexcept; EXPORT_APIFUNCTION const char *CDECL GetContainerItemSoul(unsigned int objectIndex, unsigned int itemIndex) noexcept;
/** /**
* \brief Get the action count of the container item at a certain itemIndex in the container * \brief Get the action count of the container item at a certain itemIndex in the container
@ -1076,11 +1076,11 @@ namespace ObjectFunctions
EXPORT_APIFUNCTION void CDECL InitializeObjectList(unsigned short pid) noexcept; EXPORT_APIFUNCTION void CDECL InitializeObjectList(unsigned short pid) noexcept;
EXPORT_APIFUNCTION void CDECL InitializeEvent(unsigned short pid) noexcept; EXPORT_APIFUNCTION void CDECL InitializeEvent(unsigned short pid) noexcept;
EXPORT_APIFUNCTION void CDECL CopyLastObjectListToStore() noexcept; EXPORT_APIFUNCTION void CDECL CopyLastObjectListToStore() noexcept;
EXPORT_APIFUNCTION unsigned CDECL int GetObjectChangesSize() noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectChangesSize() noexcept;
EXPORT_APIFUNCTION unsigned CDECL char GetEventAction() noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetEventAction() noexcept;
EXPORT_APIFUNCTION unsigned CDECL char GetEventContainerSubAction() noexcept; EXPORT_APIFUNCTION unsigned char CDECL GetEventContainerSubAction() noexcept;
EXPORT_APIFUNCTION unsigned CDECL int GetObjectRefNumIndex(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectRefNumIndex(unsigned int index) noexcept;
EXPORT_APIFUNCTION unsigned CDECL int GetObjectSummonerRefNumIndex(unsigned int index) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetObjectSummonerRefNumIndex(unsigned int index) noexcept;
EXPORT_APIFUNCTION void CDECL SetEventCell(const char* cellDescription) noexcept; EXPORT_APIFUNCTION void CDECL SetEventCell(const char* cellDescription) noexcept;
EXPORT_APIFUNCTION void CDECL SetEventAction(unsigned char action) noexcept; EXPORT_APIFUNCTION void CDECL SetEventAction(unsigned char action) noexcept;
EXPORT_APIFUNCTION void CDECL SetEventConsoleCommand(const char* consoleCommand) noexcept; EXPORT_APIFUNCTION void CDECL SetEventConsoleCommand(const char* consoleCommand) noexcept;

10
apps/openmw-mp/Script/Functions/Quests.hpp
View file

@ -61,7 +61,7 @@ namespace QuestFunctions
* \param pid The player ID whose journal changes should be used. * \param pid The player ID whose journal changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetJournalChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetJournalChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Get the number of indexes in a player's latest kill count changes. * \brief Get the number of indexes in a player's latest kill count changes.
@ -69,7 +69,7 @@ namespace QuestFunctions
* \param pid The player ID whose kill count changes should be used. * \param pid The player ID whose kill count changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetKillChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetKillChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Add a new journal item of type ENTRY to the journal changes for a player, * \brief Add a new journal item of type ENTRY to the journal changes for a player,
@ -135,7 +135,7 @@ namespace QuestFunctions
* \param index The index of the journalItem. * \param index The index of the journalItem.
* \return The quest. * \return The quest.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetJournalItemQuest(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetJournalItemQuest(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the quest index at a certain index in a player's latest journal changes. * \brief Get the quest index at a certain index in a player's latest journal changes.
@ -164,7 +164,7 @@ namespace QuestFunctions
* \param index The index of the journalItem. * \param index The index of the journalItem.
* \return The actor refId. * \return The actor refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetJournalItemActorRefId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetJournalItemActorRefId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the refId at a certain index in a player's latest kill count changes. * \brief Get the refId at a certain index in a player's latest kill count changes.
@ -173,7 +173,7 @@ namespace QuestFunctions
* \param index The index of the kill count. * \param index The index of the kill count.
* \return The refId. * \return The refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetKillRefId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetKillRefId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Get the number of kills at a certain index in a player's latest kill count changes. * \brief Get the number of kills at a certain index in a player's latest kill count changes.

24
apps/openmw-mp/Script/Functions/RecordsDynamic.hpp
View file

@ -127,14 +127,14 @@ namespace RecordsDynamicFunctions
* \return The type of records (0 for SPELL, 1 for POTION, 2 for ENCHANTMENT, * \return The type of records (0 for SPELL, 1 for POTION, 2 for ENCHANTMENT,
* 3 for NPC). * 3 for NPC).
*/ */
EXPORT_APIFUNCTION unsigned CDECL short GetRecordType() noexcept; EXPORT_APIFUNCTION unsigned short CDECL GetRecordType() noexcept;
/** /**
* \brief Get the number of records in the read worldstate's dynamic records. * \brief Get the number of records in the read worldstate's dynamic records.
* *
* \return The number of records. * \return The number of records.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetRecordCount() noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetRecordCount() noexcept;
/** /**
* \brief Get the number of effects for the record at a certain index in the read * \brief Get the number of effects for the record at a certain index in the read
@ -143,7 +143,7 @@ namespace RecordsDynamicFunctions
* \param recordIndex The index of the record. * \param recordIndex The index of the record.
* \return The number of effects. * \return The number of effects.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetRecordEffectCount(unsigned int recordIndex) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetRecordEffectCount(unsigned int recordIndex) noexcept;
/** /**
* \brief Get the id of the record at a certain index in the read worldstate's * \brief Get the id of the record at a certain index in the read worldstate's
@ -152,7 +152,7 @@ namespace RecordsDynamicFunctions
* \param index The index of the record. * \param index The index of the record.
* \return The id of the record. * \return The id of the record.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRecordId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRecordId(unsigned int index) noexcept;
/** /**
* \brief Get the base id (i.e. the id this record should inherit default * \brief Get the base id (i.e. the id this record should inherit default
@ -162,7 +162,7 @@ namespace RecordsDynamicFunctions
* \param index The index of the record. * \param index The index of the record.
* \return The base id of the record. * \return The base id of the record.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRecordBaseId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRecordBaseId(unsigned int index) noexcept;
/** /**
* \brief Get the subtype of the record at a certain index in the read worldstate's * \brief Get the subtype of the record at a certain index in the read worldstate's
@ -180,7 +180,7 @@ namespace RecordsDynamicFunctions
* \param index The index of the record. * \param index The index of the record.
* \return The name of the record. * \return The name of the record.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRecordName(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRecordName(unsigned int index) noexcept;
/** /**
* \brief Get the model of the record at a certain index in the read worldstate's * \brief Get the model of the record at a certain index in the read worldstate's
@ -189,7 +189,7 @@ namespace RecordsDynamicFunctions
* \param index The index of the record. * \param index The index of the record.
* \return The model of the record. * \return The model of the record.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRecordModel(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRecordModel(unsigned int index) noexcept;
/** /**
* \brief Get the icon of the record at a certain index in the read worldstate's * \brief Get the icon of the record at a certain index in the read worldstate's
@ -198,7 +198,7 @@ namespace RecordsDynamicFunctions
* \param index The index of the record. * \param index The index of the record.
* \return The icon of the record. * \return The icon of the record.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRecordIcon(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRecordIcon(unsigned int index) noexcept;
/** /**
* \brief Get the script of the record at a certain index in the read worldstate's * \brief Get the script of the record at a certain index in the read worldstate's
@ -207,7 +207,7 @@ namespace RecordsDynamicFunctions
* \param index The index of the record. * \param index The index of the record.
* \return The script of the record. * \return The script of the record.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRecordScript(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRecordScript(unsigned int index) noexcept;
/** /**
* \brief Get the enchantment id of the record at a certain index in the read * \brief Get the enchantment id of the record at a certain index in the read
@ -216,7 +216,7 @@ namespace RecordsDynamicFunctions
* \param index The index of the record. * \param index The index of the record.
* \return The enchantment id of the record. * \return The enchantment id of the record.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRecordEnchantmentId(unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRecordEnchantmentId(unsigned int index) noexcept;
/** /**
* \brief Get the enchantment charge of the record at a certain index in * \brief Get the enchantment charge of the record at a certain index in
@ -289,7 +289,7 @@ namespace RecordsDynamicFunctions
* \param effectIndex The index of the effect. * \param effectIndex The index of the effect.
* \return The ID of the effect. * \return The ID of the effect.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetRecordEffectId(unsigned int recordIndex, unsigned int effectIndex) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetRecordEffectId(unsigned int recordIndex, unsigned int effectIndex) noexcept;
/** /**
* \brief Get the ID of the attribute modified by the effect at a certain index in the * \brief Get the ID of the attribute modified by the effect at a certain index in the
@ -319,7 +319,7 @@ namespace RecordsDynamicFunctions
* \param effectIndex The index of the effect. * \param effectIndex The index of the effect.
* \return The range of the effect. * \return The range of the effect.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetRecordEffectRangeType(unsigned int recordIndex, unsigned int effectIndex) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetRecordEffectRangeType(unsigned int recordIndex, unsigned int effectIndex) noexcept;
/** /**
* \brief Get the area of the effect at a certain index in the read worldstate's current * \brief Get the area of the effect at a certain index in the read worldstate's current

8
apps/openmw-mp/Script/Functions/Server.hpp
View file

@ -93,14 +93,14 @@ namespace ServerFunctions
* *
* \return The server version. * \return The server version.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetServerVersion() noexcept; EXPORT_APIFUNCTION const char *CDECL GetServerVersion() noexcept;
/** /**
* \brief Get the protocol version of the server. * \brief Get the protocol version of the server.
* *
* \return The protocol version. * \return The protocol version.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetProtocolVersion() noexcept; EXPORT_APIFUNCTION const char *CDECL GetProtocolVersion() noexcept;
/** /**
* \brief Get the average ping of a certain player. * \brief Get the average ping of a certain player.
@ -123,14 +123,14 @@ namespace ServerFunctions
* *
* \return Port * \return Port
*/ */
EXPORT_APIFUNCTION unsigned CDECL short GetPort() noexcept; EXPORT_APIFUNCTION unsigned short CDECL GetPort() noexcept;
/** /**
* \brief Get the maximum number of players. * \brief Get the maximum number of players.
* *
* \return Max players * \return Max players
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetMaxPlayers() noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetMaxPlayers() noexcept;
/** /**
* \brief Checking if the server requires a password to connect. * \brief Checking if the server requires a password to connect.

2
apps/openmw-mp/Script/Functions/Shapeshift.hpp
View file

@ -44,7 +44,7 @@ namespace ShapeshiftFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The creature refId. * \return The creature refId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetCreatureRefId(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetCreatureRefId(unsigned short pid) noexcept;
/** /**
* \brief Check whether a player's name is replaced by that of the creature they are * \brief Check whether a player's name is replaced by that of the creature they are

6
apps/openmw-mp/Script/Functions/Spells.hpp
View file

@ -36,7 +36,7 @@ namespace SpellFunctions
* \param pid The player ID whose spellbook changes should be used. * \param pid The player ID whose spellbook changes should be used.
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetSpellbookChangesSize(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetSpellbookChangesSize(unsigned short pid) noexcept;
/** /**
* \brief Get the action type used in a player's latest spellbook changes. * \brief Get the action type used in a player's latest spellbook changes.
@ -44,7 +44,7 @@ namespace SpellFunctions
* \param pid The player ID whose spellbook changes should be used. * \param pid The player ID whose spellbook changes should be used.
* \return The action type (0 for SET, 1 for ADD, 2 for REMOVE). * \return The action type (0 for SET, 1 for ADD, 2 for REMOVE).
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetSpellbookChangesAction(unsigned short pid) noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetSpellbookChangesAction(unsigned short pid) noexcept;
/** /**
* \brief Set the action type in a player's spellbook changes. * \brief Set the action type in a player's spellbook changes.
@ -71,7 +71,7 @@ namespace SpellFunctions
* \param index The index of the spell. * \param index The index of the spell.
* \return The spellId. * \return The spellId.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetSpellId(unsigned short pid, unsigned int index) noexcept; EXPORT_APIFUNCTION const char *CDECL GetSpellId(unsigned short pid, unsigned int index) noexcept;
/** /**
* \brief Send a PlayerSpellbook packet with a player's recorded spellbook changes. * \brief Send a PlayerSpellbook packet with a player's recorded spellbook changes.

14
apps/openmw-mp/Script/Functions/Stats.hpp
View file

@ -125,7 +125,7 @@ namespace StatsFunctions
* \param attributeId The ID of the attribute. * \param attributeId The ID of the attribute.
* \return The name of the attribute. * \return The name of the attribute.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetAttributeName(unsigned short attributeId) noexcept; EXPORT_APIFUNCTION const char *CDECL GetAttributeName(unsigned short attributeId) noexcept;
/** /**
* \brief Get the name of the skill with a certain numerical ID. * \brief Get the name of the skill with a certain numerical ID.
@ -135,7 +135,7 @@ namespace StatsFunctions
* \param skillId The ID of the skill. * \param skillId The ID of the skill.
* \return The name of the skill. * \return The name of the skill.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetSkillName(unsigned short skillId) noexcept; EXPORT_APIFUNCTION const char *CDECL GetSkillName(unsigned short skillId) noexcept;
/** /**
* \brief Get the name of a player. * \brief Get the name of a player.
@ -143,7 +143,7 @@ namespace StatsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The name of the player. * \return The name of the player.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetName(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetName(unsigned short pid) noexcept;
/** /**
* \brief Get the race of a player. * \brief Get the race of a player.
@ -151,7 +151,7 @@ namespace StatsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The race of the player. * \return The race of the player.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetRace(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetRace(unsigned short pid) noexcept;
/** /**
* \brief Get the head mesh used by a player. * \brief Get the head mesh used by a player.
@ -159,7 +159,7 @@ namespace StatsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The head mesh of the player. * \return The head mesh of the player.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetHead(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetHead(unsigned short pid) noexcept;
/** /**
* \brief Get the hairstyle mesh used by a player. * \brief Get the hairstyle mesh used by a player.
@ -167,7 +167,7 @@ namespace StatsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The hairstyle mesh of the player. * \return The hairstyle mesh of the player.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetHairstyle(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetHairstyle(unsigned short pid) noexcept;
/** /**
* \brief Check whether a player is male or not. * \brief Check whether a player is male or not.
@ -183,7 +183,7 @@ namespace StatsFunctions
* \param pid The player ID. * \param pid The player ID.
* \return The birthsign of the player. * \return The birthsign of the player.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetBirthsign(unsigned short pid) noexcept; EXPORT_APIFUNCTION const char *CDECL GetBirthsign(unsigned short pid) noexcept;
/** /**
* \brief Get the character level of a player. * \brief Get the character level of a player.

4
apps/openmw-mp/Script/Functions/Worldstate.hpp
View file

@ -95,14 +95,14 @@ namespace WorldstateFunctions
* *
* \return The number of indexes. * \return The number of indexes.
*/ */
EXPORT_APIFUNCTION unsigned CDECL int GetMapChangesSize() noexcept; EXPORT_APIFUNCTION unsigned int CDECL GetMapChangesSize() noexcept;
/** /**
* \brief Get the weather region in the read worldstate. * \brief Get the weather region in the read worldstate.
* *
* \return The weather region. * \return The weather region.
*/ */
EXPORT_APIFUNCTION const CDECL char *GetWeatherRegion() noexcept; EXPORT_APIFUNCTION const char *CDECL GetWeatherRegion() noexcept;
/** /**
* \brief Get the current weather in the read worldstate. * \brief Get the current weather in the read worldstate.