Skip to content

Syncable serverside Vehicles #3334

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 2 commits into from
May 29, 2024
Merged

Syncable serverside Vehicles #3334

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
869f3b2
Add sync argument to createVehicle
znvjder Mar 9, 2024
f04dd1b
Merge branch 'master' into serverside-vehiclesync
znvjder Apr 5, 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
3 changes: 2 additions & 1 deletion Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4854,7 +4854,7 @@ bool CStaticFunctionDefinitions::SetWeaponAmmo(CElement* pElement, unsigned char
}

CVehicle* CStaticFunctionDefinitions::CreateVehicle(CResource* pResource, unsigned short usModel, const CVector& vecPosition, const CVector& vecRotation,
const char* szRegPlate, unsigned char ucVariant, unsigned char ucVariant2)
const char* szRegPlate, unsigned char ucVariant, unsigned char ucVariant2, bool bSynced)
{
unsigned char ucVariation = ucVariant;
unsigned char ucVariation2 = ucVariant2;
Expand All @@ -4873,6 +4873,7 @@ CVehicle* CStaticFunctionDefinitions::CreateVehicle(CResource* pResource, unsign
pVehicle->SetRotationDegrees(vecRotation);
pVehicle->SetRespawnPosition(vecPosition);
pVehicle->SetRespawnRotationDegrees(vecRotation);
pVehicle->SetUnoccupiedSyncable(bSynced);

if (szRegPlate && szRegPlate[0])
pVehicle->SetRegPlate(szRegPlate);
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ class CStaticFunctionDefinitions

// Vehicle create/destroy functions
static CVehicle* CreateVehicle(CResource* pResource, unsigned short usModel, const CVector& vecPosition, const CVector& vecRotation, const char* szRegPlate,
unsigned char ucVariant, unsigned char ucVariant2);
unsigned char ucVariant, unsigned char ucVariant2, bool bSynced);

// Vehicle get functions
static bool GetVehicleVariant(CVehicle* pVehicle, unsigned char& ucVariant, unsigned char& ucVariant2);
Expand Down
4 changes: 3 additions & 1 deletion Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ int CLuaVehicleDefs::CreateVehicle(lua_State* luaVM)
SString strNumberPlate;
uchar ucVariant;
uchar ucVariant2;
bool bSynced;

CScriptArgReader argStream(luaVM);
argStream.ReadNumber(usModel);
Expand All @@ -303,6 +304,7 @@ int CLuaVehicleDefs::CreateVehicle(lua_State* luaVM)
}
argStream.ReadNumber(ucVariant, 254);
argStream.ReadNumber(ucVariant2, 254);
argStream.ReadBool(bSynced, true);

if (!argStream.HasErrors())
{
Expand All @@ -316,7 +318,7 @@ int CLuaVehicleDefs::CreateVehicle(lua_State* luaVM)
{
// Create the vehicle and return its handle
CVehicle* pVehicle =
CStaticFunctionDefinitions::CreateVehicle(pResource, usModel, vecPosition, vecRotation, strNumberPlate, ucVariant, ucVariant2);
CStaticFunctionDefinitions::CreateVehicle(pResource, usModel, vecPosition, vecRotation, strNumberPlate, ucVariant, ucVariant2, bSynced);
if (pVehicle)
{
CElementGroup* pGroup = pResource->GetElementGroup();
Expand Down