mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 11:06:41 +00:00
Code Issues Releases Wiki Activity

[Server] Use regular int as return value for GetObjectSummonerPid()

Browse source 
Additionally, clarify descriptions of script functions for getting information about summoners.
This commit is contained in:
David Cernat 2018-07-05 20:26:23 +03:00
parent f02492a593
commit e8ce009521
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/Script/Functions/Objects.cpp
View file

@ -128,7 +128,7 @@ bool ObjectFunctions::DoesObjectHavePlayerSummoner(unsigned int i) noexcept
return readObjectList->baseObjects.at(i).master.isPlayer; return readObjectList->baseObjects.at(i).master.isPlayer;
} }
unsigned int ObjectFunctions::GetObjectSummonerPid(unsigned int i) noexcept int ObjectFunctions::GetObjectSummonerPid(unsigned int i) noexcept
{ {
Player *player = Players::getPlayer(readObjectList->baseObjects.at(i).master.guid); Player *player = Players::getPlayer(readObjectList->baseObjects.at(i).master.guid);

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

@ -287,6 +287,7 @@ public:
* *
* Only living actors can be summoned. * Only living actors can be summoned.
* *
* \param i The index of the object.
* \return Whether a player is the summoner of the object. * \return Whether a player is the summoner of the object.
*/ */
static bool DoesObjectHavePlayerSummoner(unsigned int i) noexcept; static bool DoesObjectHavePlayerSummoner(unsigned int i) noexcept;
@ -298,10 +299,10 @@ public:
* \param i The index of the object. * \param i The index of the object.
* \return The player ID of the summoner. * \return The player ID of the summoner.
*/ */
static unsigned int GetObjectSummonerPid(unsigned int i) noexcept; static int GetObjectSummonerPid(unsigned int i) noexcept;
/** /**
* \brief Get the refId of the summoner of the object at a certain index in the read object * \brief Get the refId of the actor summoner of the object at a certain index in the read object
* list's object changes. * list's object changes.
* *
* \param i The index of the object. * \param i The index of the object.
@ -310,7 +311,7 @@ public:
static const char *GetObjectSummonerRefId(unsigned int i) noexcept; static const char *GetObjectSummonerRefId(unsigned int i) noexcept;
/** /**
* \brief Get the refNumIndex of the summoner of the object at a certain index in the read object * \brief Get the refNumIndex of the actor summoner of the object at a certain index in the read object
* list's object changes. * list's object changes.
* *
* \param i The index of the object. * \param i The index of the object.
@ -319,7 +320,7 @@ public:
static int GetObjectSummonerRefNumIndex(unsigned int i) noexcept; static int GetObjectSummonerRefNumIndex(unsigned int i) noexcept;
/** /**
* \brief Get the mpNum of the summoner of the object at a certain index in the read object list's * \brief Get the mpNum of the actor summoner of the object at a certain index in the read object list's
* object changes. * object changes.
* *
* \param i The index of the object. * \param i The index of the object.