Skip to content

Add onClientObjectMoveStart, onClientObjectMoveStop, isObjectMoving #2023

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

Merged
merged 6 commits into from
Jan 20, 2021
Merged

Add onClientObjectMoveStart, onClientObjectMoveStop, isObjectMoving #2023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77596ec
Add onClientObjectMove, onClientObjectMoveFinish event, add isObjectM…
fresholia Jan 18, 2021
3c14d50
Fix crash (tested)
fresholia Jan 18, 2021
42cb04d
Changed events
fresholia Jan 18, 2021
ab89799
Update parser
fresholia Jan 18, 2021
bb7c3d0
unnecessary codes removed
fresholia Jan 18, 2021
92ad7f1
Update CDeathmatchObject.cpp
fresholia Jan 20, 2021
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 Client/mods/deathmatch/logic/CClientGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2598,6 +2598,8 @@ void CClientGame::AddBuiltInEvents()
// Object events
m_Events.AddEvent("onClientObjectDamage", "loss, attacker", NULL, false);
m_Events.AddEvent("onClientObjectBreak", "attacker", NULL, false);
m_Events.AddEvent("onClientObjectMoveStart", "", NULL, false);
m_Events.AddEvent("onClientObjectMoveStop", "", NULL, false);

// Web events
m_Events.AddEvent("onClientBrowserWhitelistChange", "newPages", NULL, false);
Expand Down
4 changes: 4 additions & 0 deletions Client/mods/deathmatch/logic/CDeathmatchObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ void CDeathmatchObject::StartMovement(const CPositionRotationAnimation& a_rMoveA
a_rMoveAnimation.GetFinalValue(positionRotation);
SetOrientation(positionRotation.m_vecPosition, positionRotation.m_vecRotation);
}
CLuaArguments Arguments;
this->CallEvent("onClientObjectMoveStart", Arguments, true);
}

void CDeathmatchObject::StopMovement()
Expand All @@ -86,6 +88,8 @@ void CDeathmatchObject::_StopMovement(bool a_bUnregister)
}
delete m_pMoveAnimation;
m_pMoveAnimation = NULL;
CLuaArguments Arguments;
this->CallEvent("onClientObjectMoveStop", Arguments, true);
}
}

Expand Down
6 changes: 6 additions & 0 deletions Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3865,6 +3865,12 @@ bool CStaticFunctionDefinitions::IsObjectBreakable(CClientObject& Object, bool&
return true;
}

bool CStaticFunctionDefinitions::IsObjectMoving(CClientEntity& Entity)
{
CDeathmatchObject& Object = static_cast<CDeathmatchObject&>(Entity);
return Object.IsMoving();
}

bool CStaticFunctionDefinitions::GetObjectMass(CClientObject& Object, float& fMass)
{
fMass = Object.GetMass();
Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ class CStaticFunctionDefinitions
static CClientObject* CreateObject(CResource& Resource, unsigned short usModelID, const CVector& vecPosition, const CVector& vecRotation, bool bLowLod);
static bool GetObjectScale(CClientObject& Object, CVector& vecScale);
static bool IsObjectBreakable(CClientObject& Object, bool& bBreakable);
static bool IsObjectMoving(CClientEntity& Entity);
static bool GetObjectMass(CClientObject& Object, float& fMass);
static bool GetObjectTurnMass(CClientObject& Object, float& fTurnMass);
static bool GetObjectAirResistance(CClientObject& Object, float& fAirResistance);
Expand Down
9 changes: 9 additions & 0 deletions Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*****************************************************************************/

#include "StdInc.h"
#include <lua/CLuaFunctionParser.h>

void CLuaObjectDefs::LoadFunctions()
{
Expand All @@ -23,6 +24,7 @@ void CLuaObjectDefs::LoadFunctions()
{"isObjectBreakable", IsObjectBreakable},
{"getObjectMass", GetObjectMass},
{"getObjectProperty", GetObjectProperty},
{"isObjectMoving", ArgumentParser<IsObjectMoving>},

// Object set funcs
{"moveObject", MoveObject},
Expand Down Expand Up @@ -58,12 +60,14 @@ void CLuaObjectDefs::AddClass(lua_State* luaVM)
lua_classfunction(luaVM, "getMass", "getObjectMass");
lua_classfunction(luaVM, "getProperties", GetObjectProperties);
lua_classfunction(luaVM, "getProperty", "getObjectProperty");
lua_classfunction(luaVM, "isMoving", "isObjectMoving");

lua_classfunction(luaVM, "setScale", "setObjectScale");
lua_classfunction(luaVM, "setBreakable", "setObjectBreakable");
lua_classfunction(luaVM, "setMass", "setObjectMass");
lua_classfunction(luaVM, "setProperty", "setObjectProperty");

lua_classvariable(luaVM, "moving", nullptr, "isObjectMoving");
lua_classvariable(luaVM, "scale", "setObjectScale", "getObjectScale");
lua_classvariable(luaVM, "breakable", "setObjectBreakable", "isObjectBreakable");
lua_classvariable(luaVM, "mass", "setObjectMass", "getObjectMass");
Expand Down Expand Up @@ -209,6 +213,11 @@ int CLuaObjectDefs::IsObjectBreakable(lua_State* luaVM)
return 1;
}

bool CLuaObjectDefs::IsObjectMoving(CClientEntity* pEntity)
{
return CStaticFunctionDefinitions::IsObjectMoving(*pEntity);
}

int CLuaObjectDefs::GetObjectMass(lua_State* luaVM)
{
// float getObjectMass ( object theObject )
Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class CLuaObjectDefs : public CLuaDefs

// Object get funcs
LUA_DECLARE(IsObjectStatic);
static bool IsObjectMoving(CClientEntity* pEntity);
LUA_DECLARE(GetObjectScale);
LUA_DECLARE(IsObjectBreakable);
LUA_DECLARE(GetObjectMass);
Expand Down