Skip to content
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
30 changes: 30 additions & 0 deletions Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,36 @@ bool CStaticFunctionDefinitions::IsElementSyncer(CClientEntity& Entity, bool& bI
return true;
}

std::vector<CClientEntity*> CStaticFunctionDefinitions::GetElementsSyncedByPlayer()
{
std::vector<CClientEntity*> elements;

// Check all peds
CPedSync* pPedSync = m_pClientGame->GetPedSync();
for (auto iter = pPedSync->IterBegin(); iter != pPedSync->IterEnd(); ++iter)
{
elements.push_back(*iter);
}

// Check all vehicles
CUnoccupiedVehicleSync* pVehicleSync = m_pClientGame->GetUnoccupiedVehicleSync();
for (auto iter = pVehicleSync->IterBegin(); iter != pVehicleSync->IterEnd(); ++iter)
{
elements.push_back(*iter);
}

#ifdef WITH_OBJECT_SYNC
// Check all objects
CObjectSync* pObjectSync = m_pClientGame->GetObjectSync();
for (auto iter = pObjectSync->IterBegin(); iter != pObjectSync->IterEnd(); ++iter)
{
elements.push_back(*iter);
}
#endif

return elements;
}

bool CStaticFunctionDefinitions::IsElementCollidableWith(CClientEntity& Entity, CClientEntity& ThisEntity, bool& bCanCollide)
{
switch (Entity.GetType())
Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class CStaticFunctionDefinitions
static bool GetElementModel(CClientEntity& Entity, unsigned short& usModel);
static bool IsElementInWater(CClientEntity& Entity, bool& bInWater);
static bool IsElementSyncer(CClientEntity& Entity, bool& bIsSyncer);
static std::vector<CClientEntity*> GetElementsSyncedByPlayer();
static bool IsElementCollidableWith(CClientEntity& Entity, CClientEntity& ThisEntity, bool& bCanCollide);
static bool GetElementCollisionsEnabled(CClientEntity& Entity);
static bool IsElementFrozen(CClientEntity& Entity, bool& bFrozen);
Expand Down
6 changes: 6 additions & 0 deletions Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ void CLuaElementDefs::LoadFunctions()
{"getElementColShape", GetElementColShape},
{"isElementInWater", IsElementInWater},
{"isElementSyncer", IsElementSyncer},
{"getElementsSyncedByPlayer", ArgumentParser<GetElementsSyncedByPlayer>},
{"isElementCollidableWith", IsElementCollidableWith},
{"isElementDoubleSided", IsElementDoubleSided},
{"getElementCollisionsEnabled", GetElementCollisionsEnabled},
Expand Down Expand Up @@ -1478,6 +1479,11 @@ int CLuaElementDefs::IsElementSyncer(lua_State* luaVM)
return 1;
}

std::vector<CClientEntity*> CLuaElementDefs::GetElementsSyncedByPlayer()
{
return CStaticFunctionDefinitions::GetElementsSyncedByPlayer();
}

int CLuaElementDefs::IsElementCollidableWith(lua_State* luaVM)
{
// Verify the arguments
Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class CLuaElementDefs : public CLuaDefs
LUA_DECLARE(GetElementColShape);
LUA_DECLARE(IsElementInWater);
LUA_DECLARE(IsElementSyncer);
static std::vector<CClientEntity*> GetElementsSyncedByPlayer();
LUA_DECLARE(IsElementCollidableWith);
LUA_DECLARE(IsElementDoubleSided);
LUA_DECLARE(GetElementCollisionsEnabled);
Expand Down
34 changes: 34 additions & 0 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,40 @@ CElement* CStaticFunctionDefinitions::GetElementSyncer(CElement* pElement)
return NULL;
}

std::vector<CElement*> CStaticFunctionDefinitions::GetElementsSyncedByPlayer(CPlayer* pPlayer)
{
assert(pPlayer);

std::vector<CElement*> elements;

// Check all vehicles
for (CVehicle* pVehicle : m_pVehicleManager->GetVehicles())
{
if (pVehicle->GetSyncer() == pPlayer)
elements.push_back(pVehicle);
}

// Check all peds
for (auto iter = m_pPedManager->IterBegin(); iter != m_pPedManager->IterEnd(); ++iter)
{
CPed* pPed = *iter;
if (pPed->GetSyncer() == pPlayer)
elements.push_back(pPed);
}

#ifdef WITH_OBJECT_SYNC
// Check all objects
for (auto iter = m_pObjectManager->IterBegin(); iter != m_pObjectManager->IterEnd(); ++iter)
{
CObject* pObject = *iter;
if (pObject->GetSyncer() == pPlayer)
elements.push_back(pObject);
}
#endif

return elements;
}

bool CStaticFunctionDefinitions::GetElementCollisionsEnabled(CElement* pElement)
{
assert(pElement);
Expand Down
1 change: 1 addition & 0 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class CStaticFunctionDefinitions
static bool IsElementInWater(CElement* pElement, bool& bInWater);
static bool GetElementAttachedOffsets(CElement* pElement, CVector& vecPosition, CVector& vecRotation);
static CElement* GetElementSyncer(CElement* pElement);
static std::vector<CElement*> GetElementsSyncedByPlayer(CPlayer* pPlayer);
static bool GetElementCollisionsEnabled(CElement* pElement);
static bool IsElementFrozen(CElement* pElement, bool& bFrozen);
static bool GetLowLodElement(CElement* pElement, CElement*& pOutLowLodElement);
Expand Down
6 changes: 6 additions & 0 deletions Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ void CLuaElementDefs::LoadFunctions()
{"getElementHealth", getElementHealth},
{"getElementModel", getElementModel},
{"getElementSyncer", getElementSyncer},
{"getElementsSyncedByPlayer", ArgumentParser<GetElementsSyncedByPlayer>},
{"getElementCollisionsEnabled", getElementCollisionsEnabled},
{"getLowLODElement", getLowLODElement},
{"isElementOnFire", ArgumentParser<IsElementOnFire>},
Expand Down Expand Up @@ -1383,6 +1384,11 @@ int CLuaElementDefs::getElementSyncer(lua_State* luaVM)
return 1;
}

std::vector<CElement*> CLuaElementDefs::GetElementsSyncedByPlayer(CPlayer* player)
{
return CStaticFunctionDefinitions::GetElementsSyncedByPlayer(player);
}

int CLuaElementDefs::getElementCollisionsEnabled(lua_State* luaVM)
{
// bool getElementCollisionsEnabled ( element theElement )
Expand Down
1 change: 1 addition & 0 deletions Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class CLuaElementDefs : public CLuaDefs
LUA_DECLARE(getElementModel);
LUA_DECLARE(isElementInWater);
LUA_DECLARE(getElementSyncer);
static std::vector<CElement*> GetElementsSyncedByPlayer(CPlayer* player);
LUA_DECLARE(getElementCollisionsEnabled);
LUA_DECLARE(isElementFrozen);
LUA_DECLARE(getLowLODElement);
Expand Down
1 change: 1 addition & 0 deletions Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ void CLuaPlayerDefs::AddClass(lua_State* luaVM)
lua_classfunction(luaVM, "getCameraMatrix", "getCameraMatrix");
lua_classfunction(luaVM, "getCameraTarget", "getCameraTarget");
lua_classfunction(luaVM, "getScriptDebugLevel", "getPlayerScriptDebugLevel");
lua_classfunction(luaVM, "getElementsSyncedBy", "getElementsSyncedByPlayer");

lua_classvariable(luaVM, "account", NULL, "getPlayerAccount");
lua_classvariable(luaVM, "cameraInterior", "setCameraInterior", "getCameraInterior");
Expand Down