mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-06-29 10:21:37 +00:00
Code Issues Releases Wiki Activity

[Server] Move ObjectFunctions for setting summoning to their own spot

Browse source
This commit is contained in:
David Cernat 2019-11-30 20:44:27 +02:00
parent 5575242299
commit c6542ffec4
2 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;

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

@ -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.