Skip to content

Commit 82db486

Browse files
committed
Renamed callbacks
1 parent 840067c commit 82db486

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Server/Components/Pawn/Scripting/Vehicle/Events.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,22 @@ struct VehicleEvents : public VehicleEventHandler, public Singleton<VehicleEvent
122122
return !!ret;
123123
}
124124

125-
bool onVehicleTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
125+
bool onTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
126126
{
127-
cell ret = PawnManager::Get()->CallInSides("OnVehicleTrailerAttach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
127+
cell ret = PawnManager::Get()->CallInSides("OnTrailerAttach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
128128
if (!ret)
129129
{
130-
ret = PawnManager::Get()->CallInEntry("OnVehicleTrailerAttach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
130+
ret = PawnManager::Get()->CallInEntry("OnTrailerAttach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
131131
}
132132
return !!ret;
133133
}
134134

135-
bool onVehicleTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
135+
bool onTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
136136
{
137-
cell ret = PawnManager::Get()->CallInSides("OnVehicleTrailerDetach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
137+
cell ret = PawnManager::Get()->CallInSides("OnTrailerDetach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
138138
if (!ret)
139139
{
140-
ret = PawnManager::Get()->CallInEntry("OnVehicleTrailerDetach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
140+
ret = PawnManager::Get()->CallInEntry("OnTrailerDetach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
141141
}
142142
return !!ret;
143143
}

Server/Components/Vehicles/vehicle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I
244244

245245
static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
246246
{
247-
return handler->onVehicleTrailerAttach(player, *this, *trailer);
247+
return handler->onTrailerAttach(player, *this, *trailer);
248248
});
249249
}
250250
}
@@ -260,7 +260,7 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I
260260
{
261261
static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
262262
{
263-
return handler->onVehicleTrailerDetach(player, *this, *trailer);
263+
return handler->onTrailerDetach(player, *this, *trailer);
264264
});
265265

266266
trailer->cab = nullptr;

0 commit comments

Comments
 (0)