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

[Server] Add script function for getting a summoner's pid

Browse source 
Additionally, fix typos in the comments for other script functions relating to summoners.
This commit is contained in:
David Cernat 2018-07-04 04:26:44 +03:00
parent 8a23a96da4
commit 3438061b55
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,14 @@ 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
{
Player *player = Players::getPlayer(readObjectList->baseObjects.at(i).master.guid);
if (player != nullptr)
return player->getId();
}
const char *ObjectFunctions::GetObjectSummonerRefId(unsigned int i) noexcept const char *ObjectFunctions::GetObjectSummonerRefId(unsigned int i) noexcept
{ {
return readObjectList->baseObjects.at(i).master.refId.c_str(); return readObjectList->baseObjects.at(i).master.refId.c_str();

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

@ -28,6 +28,7 @@
{"GetObjectSummonState", ObjectFunctions::GetObjectSummonState},\ {"GetObjectSummonState", ObjectFunctions::GetObjectSummonState},\
{"GetObjectSummonDuration", ObjectFunctions::GetObjectSummonDuration},\ {"GetObjectSummonDuration", ObjectFunctions::GetObjectSummonDuration},\
{"DoesObjectHavePlayerSummoner", ObjectFunctions::DoesObjectHavePlayerSummoner},\ {"DoesObjectHavePlayerSummoner", ObjectFunctions::DoesObjectHavePlayerSummoner},\
{"GetObjectSummonerPid", ObjectFunctions::GetObjectSummonerPid},\
{"GetObjectSummonerRefId", ObjectFunctions::GetObjectSummonerRefId},\ {"GetObjectSummonerRefId", ObjectFunctions::GetObjectSummonerRefId},\
{"GetObjectSummonerRefNumIndex", ObjectFunctions::GetObjectSummonerRefNumIndex},\ {"GetObjectSummonerRefNumIndex", ObjectFunctions::GetObjectSummonerRefNumIndex},\
{"GetObjectSummonerMpNum", ObjectFunctions::GetObjectSummonerMpNum},\ {"GetObjectSummonerMpNum", ObjectFunctions::GetObjectSummonerMpNum},\
@ -290,13 +291,21 @@ public:
*/ */
static bool DoesObjectHavePlayerSummoner(unsigned int i) noexcept; static bool DoesObjectHavePlayerSummoner(unsigned int i) noexcept;
/**
* \brief Get the player ID of the summoner of the object at a certain index in the read object
* list's object changes.
*
* \param i The index of the object.
* \return The player ID of the summoner.
*/
static unsigned 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 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 summoner. * \param i The index of the object.
* \return The refNumIndex. * \return The refId of the summoner.
*/ */
static const char *GetObjectSummonerRefId(unsigned int i) noexcept; static const char *GetObjectSummonerRefId(unsigned int i) noexcept;
@ -304,8 +313,8 @@ public:
* \brief Get the refNumIndex of the summoner of the object at a certain index in the read object * \brief Get the refNumIndex of the 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 summoner. * \param i The index of the object.
* \return The refNumIndex. * \return The refNumIndex of the summoner.
*/ */
static int GetObjectSummonerRefNumIndex(unsigned int i) noexcept; static int GetObjectSummonerRefNumIndex(unsigned int i) noexcept;
@ -313,8 +322,8 @@ public:
* \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 summoner of the object at a certain index in the read object list's
* object changes. * object changes.
* *
* \param i The index of the summoner. * \param i The index of the object.
* \return The mpNum. * \return The mpNum of the summoner.
*/ */
static int GetObjectSummonerMpNum(unsigned int i) noexcept; static int GetObjectSummonerMpNum(unsigned int i) noexcept;