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

[Server] Add script function for checking if object's summoner is player

Browse source
This commit is contained in:
David Cernat 2018-07-02 15:54:39 +03:00
parent d162f6fd3a
commit f9ebe400f7
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,6 +123,11 @@ double ObjectFunctions::GetObjectSummonDuration(unsigned int i) noexcept
return readObjectList->baseObjects.at(i).summonDuration; return readObjectList->baseObjects.at(i).summonDuration;
} }
bool ObjectFunctions::DoesObjectHavePlayerSummoner(unsigned int i) noexcept
{
return readObjectList->baseObjects.at(i).master.isPlayer;
}
double ObjectFunctions::GetObjectPosX(unsigned int i) noexcept double ObjectFunctions::GetObjectPosX(unsigned int i) noexcept
{ {
return readObjectList->baseObjects.at(i).position.pos[0]; return readObjectList->baseObjects.at(i).position.pos[0];

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

@ -26,6 +26,7 @@
{"GetObjectLockLevel", ObjectFunctions::GetObjectLockLevel},\ {"GetObjectLockLevel", ObjectFunctions::GetObjectLockLevel},\
{"GetObjectSummonState", ObjectFunctions::GetObjectSummonState},\ {"GetObjectSummonState", ObjectFunctions::GetObjectSummonState},\
{"GetObjectSummonDuration", ObjectFunctions::GetObjectSummonDuration},\ {"GetObjectSummonDuration", ObjectFunctions::GetObjectSummonDuration},\
{"DoesObjectHavePlayerSummoner", ObjectFunctions::DoesObjectHavePlayerSummoner},\
{"GetObjectPosX", ObjectFunctions::GetObjectPosX},\ {"GetObjectPosX", ObjectFunctions::GetObjectPosX},\
{"GetObjectPosY", ObjectFunctions::GetObjectPosY},\ {"GetObjectPosY", ObjectFunctions::GetObjectPosY},\
{"GetObjectPosZ", ObjectFunctions::GetObjectPosZ},\ {"GetObjectPosZ", ObjectFunctions::GetObjectPosZ},\
@ -257,7 +258,7 @@ public:
* \brief Check whether the object at a certain index in the read object list's object changes * \brief Check whether the object at a certain index in the read object list's object changes
* is a summon. * is a summon.
* *
* Only living actors can have be summoned. * Only living actors can be summoned.
* *
* \return The summon state. * \return The summon state.
*/ */
@ -274,6 +275,16 @@ public:
*/ */
static double GetObjectSummonDuration(unsigned int i) noexcept; static double GetObjectSummonDuration(unsigned int i) noexcept;
/**
* \brief Check whether the object at a certain index in the read object list's object changes
* has a player as its summoner.
*
* Only living actors can be summoned.
*
* \return The summon state.
*/
static bool DoesObjectHavePlayerSummoner(unsigned int i) noexcept;
/** /**
* \brief Get the X position of the object at a certain index in the read object list's object * \brief Get the X position of the object at a certain index in the read object list's object
* changes. * changes.