Skip to content
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

Add onObjectMoveStart and onObjectMoveStop Events for Server-Side #3408

Closed
wants to merge 2 commits into from
Closed

Add onObjectMoveStart and onObjectMoveStop Events for Server-Side #3408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9be341
add events: onObjectMoveStart, onObjectMoveStop
esmail9900 May 27, 2024
0ff4fd3
Added Event Caller For: onObjectMoveStart, onObjectMoveStop
esmail9900 May 27, 2024
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
2 changes: 2 additions & 0 deletions Server/mods/deathmatch/logic/CGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,6 +1548,8 @@ void CGame::AddBuiltInEvents()
m_Events.AddEvent("onPlayerVoiceStop", "", NULL, false);

// Object events
m_Events.AddEvent("onObjectMoveStart", "", nullptr, false);
m_Events.AddEvent("onObjectMoveStop", "", nullptr, false);

// Pickup events
m_Events.AddEvent("onPickupHit", "player", NULL, false);
Expand Down
8 changes: 8 additions & 0 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8202,6 +8202,10 @@ bool CStaticFunctionDefinitions::MoveObject(CResource* pResource, CElement* pEle
moveAnimation.SetEasing(a_easingType, a_fEasingPeriod, a_fEasingAmplitude, a_fEasingOvershoot);
moveAnimation.SetDuration(ulTime);

CLuaArguments Arguments;
if (!pObject->CallEvent("onObjectMoveStart", Arguments)) // Call Event
return false; // Event cancelled, return false

// Start moving it here so we can keep track of the position/rotation
pObject->Move(moveAnimation);

Expand Down Expand Up @@ -8229,6 +8233,10 @@ bool CStaticFunctionDefinitions::StopObject(CElement* pElement)
{
CObject* pObject = static_cast<CObject*>(pElement);

CLuaArguments Arguments;
if (!pObject->CallEvent("onObjectMoveStop", Arguments))
return false; // Event cancelled, return false

pObject->StopMoving();

// Grab the source position and rotation
Expand Down
Loading