Skip to content

Vehicle trailer features #1093

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
NoPressF wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Vehicle trailer features #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
840067c
Implement vehicle's callbacks (OnVehicleTrailerAttach & OnVehicleTrai…
NoPressF Oct 27, 2024
382d92f
Renamed callbacks
NoPressF May 24, 2025
9488104
Merge branch 'vehicle-trailer-features' of https://github.com/NoPress…
NoPressF May 24, 2025
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: 1 addition & 1 deletion SDK
Open in desktop
Submodule SDK updated 5 files
+1 −1 CMakeLists.txt
+1 −1 README.md
+2 −0 include/Server/Components/Vehicles/vehicles.hpp
+1 −2 include/network.hpp
+0 −3 include/player.hpp
20 changes: 20 additions & 0 deletions Server/Components/Pawn/Scripting/Vehicle/Events.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,24 @@ struct VehicleEvents : public VehicleEventHandler, public Singleton<VehicleEvent
}
return !!ret;
}

bool onTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
{
cell ret = PawnManager::Get()->CallInSides("OnTrailerAttach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
if (!ret)
{
ret = PawnManager::Get()->CallInEntry("OnTrailerAttach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
}
return !!ret;
}

bool onTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
{
cell ret = PawnManager::Get()->CallInSides("OnTrailerDetach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
if (!ret)
{
ret = PawnManager::Get()->CallInEntry("OnTrailerDetach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
}
return !!ret;
}
};
14 changes: 12 additions & 2 deletions Server/Components/TestComponent/dllmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,16 @@ struct TestComponent : public IComponent, public PlayerDamageEventHandler, publi
player.sendClientMessage(Colour::White(), "onVehicleSirenStateChange(" + std::to_string(player.getID()) + ", " + std::to_string(vehicle.getID()) + ", " + std::to_string((int)sirenState) + ")");
return true;
}
bool onTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
{
player.sendClientMessage(Colour::White(), "onTrailerAttach(" + std::to_string(player.getID()) + ", " + std::to_string(vehicle.getID()) + ", " + std::to_string(vehicle.getTrailer()->getID()) + ")");
return true;
}
bool onTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
{
player.sendClientMessage(Colour::White(), "onTrailerDetach(" + std::to_string(player.getID()) + ", " + std::to_string(vehicle.getID()) + ", " + std::to_string(vehicle.getTrailer()->getID()) + ")");
return true;
}
} vehicleEventWatcher;

void onPlayerConnect(IPlayer& player) override
Expand Down Expand Up @@ -1098,8 +1108,8 @@ struct TestComponent : public IComponent, public PlayerDamageEventHandler, publi
{
vehicle = vehicles->create(false, 411, Vector3(0.0f, 5.0f, 3.5f)); // Create infernus
vehicles->create(false, 488, Vector3(-12.0209f, 1.4806f, 3.1172f)); // Create news maverick
tower = vehicles->create(false, 583, Vector3(15.0209f, 1.4806f, 3.1172f));
trailer = vehicles->create(false, 606, Vector3(12.0209f, 5.4806f, 3.1172f));
tower = vehicles->create(false, 403, Vector3(15.0209f, 1.4806f, 3.1172f));
trailer = vehicles->create(false, 435, Vector3(0.0209f, 5.4806f, 3.1172f));
tower->attachTrailer(*trailer);
train = vehicles->create(false, 537, Vector3(-1943.2583f, 163.6151f, 25.8754f));
vehicles->getEventDispatcher().addEventHandler(&vehicleEventWatcher);
Expand Down
10 changes: 10 additions & 0 deletions Server/Components/Vehicles/vehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I
else
{
trailer->cab = this;

static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
{
return handler->onTrailerAttach(player, *this, *trailer);
});
}
}
}
Expand All @@ -253,6 +258,11 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I
// Client is reporting no trailer (probably lost it) but server thinks there's still one. Detaching it server side.
if (trailer && Time::now() - trailer->trailerUpdateTime > Seconds(0))
{
static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
{
return handler->onTrailerDetach(player, *this, *trailer);
});

trailer->cab = nullptr;
trailer = nullptr;
}
Expand Down