diff --git a/apps/openmw-mp/Script/Functions/Objects.cpp b/apps/openmw-mp/Script/Functions/Objects.cpp index 9373fad48..0ed8f1c53 100644 --- a/apps/openmw-mp/Script/Functions/Objects.cpp +++ b/apps/openmw-mp/Script/Functions/Objects.cpp @@ -380,21 +380,11 @@ void ObjectFunctions::SetObjectLockLevel(int lockLevel) noexcept tempObject.lockLevel = lockLevel; } -void ObjectFunctions::SetObjectSummonDuration(float summonDuration) noexcept -{ - tempObject.summonDuration = summonDuration; -} - void ObjectFunctions::SetObjectDisarmState(bool disarmState) noexcept { tempObject.isDisarmed = disarmState; } -void ObjectFunctions::SetObjectSummonState(bool summonState) noexcept -{ - tempObject.isSummon = summonState; -} - void ObjectFunctions::SetObjectPosition(double x, double y, double z) noexcept { tempObject.position.pos[0] = x; @@ -409,6 +399,16 @@ void ObjectFunctions::SetObjectRotation(double x, double y, double z) noexcept tempObject.position.rot[2] = z; } +void ObjectFunctions::SetObjectSummonState(bool summonState) noexcept +{ + tempObject.isSummon = summonState; +} + +void ObjectFunctions::SetObjectSummonDuration(float summonDuration) noexcept +{ + tempObject.summonDuration = summonDuration; +} + void ObjectFunctions::SetObjectActivatingPid(unsigned short pid) noexcept { Player *player; diff --git a/apps/openmw-mp/Script/Functions/Objects.hpp b/apps/openmw-mp/Script/Functions/Objects.hpp index d55224408..737c7a53a 100644 --- a/apps/openmw-mp/Script/Functions/Objects.hpp +++ b/apps/openmw-mp/Script/Functions/Objects.hpp @@ -83,11 +83,12 @@ {"SetObjectState", ObjectFunctions::SetObjectState},\ {"SetObjectLockLevel", ObjectFunctions::SetObjectLockLevel},\ {"SetObjectDisarmState", ObjectFunctions::SetObjectDisarmState},\ - {"SetObjectSummonDuration", ObjectFunctions::SetObjectSummonDuration},\ - {"SetObjectSummonState", ObjectFunctions::SetObjectSummonState},\ {"SetObjectPosition", ObjectFunctions::SetObjectPosition},\ {"SetObjectRotation", ObjectFunctions::SetObjectRotation},\ \ + {"SetObjectSummonState", ObjectFunctions::SetObjectSummonState},\ + {"SetObjectSummonDuration", ObjectFunctions::SetObjectSummonDuration},\ + \ {"SetObjectActivatingPid", ObjectFunctions::SetObjectActivatingPid},\ \ {"SetObjectDoorState", ObjectFunctions::SetObjectDoorState},\ @@ -741,14 +742,6 @@ public: */ static void SetObjectLockLevel(int lockLevel) noexcept; - /** - * \brief Set the summon duration of the temporary object stored on the server. - * - * \param summonDuration The summon duration. - * \return void - */ - static void SetObjectSummonDuration(float summonDuration) noexcept; - /** * \brief Set the disarm state of the temporary object stored on the server. * @@ -757,17 +750,6 @@ public: */ static void SetObjectDisarmState(bool disarmState) noexcept; - /** - * \brief Set the summon state of the temporary object stored on the server. - * - * This only affects living actors and determines whether they are summons of another - * living actor. - * - * \param summonState The summon state. - * \return void - */ - static void SetObjectSummonState(bool summonState) noexcept; - /** * \brief Set the position of the temporary object stored on the server. * @@ -788,6 +770,25 @@ public: */ static void SetObjectRotation(double x, double y, double z) noexcept; + /** + * \brief Set the summon state of the temporary object stored on the server. + * + * This only affects living actors and determines whether they are summons of another + * living actor. + * + * \param summonState The summon state. + * \return void + */ + static void SetObjectSummonState(bool summonState) noexcept; + + /** + * \brief Set the summon duration of the temporary object stored on the server. + * + * \param summonDuration The summon duration. + * \return void + */ + static void SetObjectSummonDuration(float summonDuration) noexcept; + /** * \brief Set the player ID of the player activating the temporary object stored on the * server. Currently only used for ObjectActivate packets.