Skip to content

Fix syncRotation ignored to AttachPlayerObjectToObject #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimoSbara wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix syncRotation ignored to AttachPlayerObjectToObject #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Server/Components/CAPI/Impl/Objects/APIs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,15 +490,15 @@ OMP_CAPI(PlayerObject_AttachToPlayer, bool(objectPtr player, objectPtr object, o
return true;
}

OMP_CAPI(PlayerObject_AttachToObject, bool(objectPtr player, objectPtr object, objectPtr attachedTo, float offsetX, float offsetY, float offsetZ, float rotationX, float rotationY, float rotationZ))
OMP_CAPI(PlayerObject_AttachToObject, bool(objectPtr player, objectPtr object, objectPtr attachedTo, float offsetX, float offsetY, float offsetZ, float rotationX, float rotationY, float rotationZ, bool syncRotation))
{
POOL_ENTITY_RET(players, IPlayer, player, player_, false);
PLAYER_POOL_ENTITY_RET(player_, IPlayerObjectData, IPlayerObject, object, object_, false);

if (attachedTo)
{
PLAYER_POOL_ENTITY_RET(player_, IPlayerObjectData, IPlayerObject, attachedTo, attachedTo_, false);
object_->attachToObject(*attachedTo_, { offsetX, offsetY, offsetZ }, { rotationX, rotationY, rotationZ });
object_->attachToObject(*attachedTo_, { offsetX, offsetY, offsetZ }, { rotationX, rotationY, rotationZ }, syncRotation);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions Server/Components/Objects/object.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,9 @@ class PlayerObject final : public BaseObject<IPlayerObject>
restream();
}

void attachToObject(IPlayerObject& object, Vector3 offset, Vector3 rotation) override
void attachToObject(IPlayerObject& object, Vector3 offset, Vector3 rotation, bool syncRotation) override
{
setAttachmentData(ObjectAttachmentData::Type::Object, object.getID(), offset, rotation, true);
setAttachmentData(ObjectAttachmentData::Type::Object, object.getID(), offset, rotation, syncRotation);
restream();
}

Expand Down
4 changes: 2 additions & 2 deletions Server/Components/Pawn/Scripting/Object/PlayerNatives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ SCRIPT_API(AttachPlayerObjectToPlayer, bool(IPlayer& player, IPlayerObject& obje
return true;
}

SCRIPT_API(AttachPlayerObjectToObject, bool(IPlayer& player, IPlayerObject& object, IPlayerObject* attachedTo, Vector3 offset, Vector3 rotation))
SCRIPT_API(AttachPlayerObjectToObject, bool(IPlayer& player, IPlayerObject& object, IPlayerObject* attachedTo, Vector3 offset, Vector3 rotation, bool syncRotation))
{
if (attachedTo)
{
object.attachToObject(*attachedTo, offset, rotation);
object.attachToObject(*attachedTo, offset, rotation, syncRotation);
}
else
{
Expand Down