Skip to content

Commit d823fdc

Browse files
committed
Add 'forcedByScript' parameter to on(Player)VehicleExit
1 parent ba64500 commit d823fdc

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Server/mods/deathmatch/logic/CGame.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3099,13 +3099,15 @@ void CGame::Packet_Vehicle_InOut ( CVehicleInOutPacket& Packet )
30993099
Arguments.PushElement ( pVehicle ); // vehicle
31003100
Arguments.PushNumber ( ucOccupiedSeat ); // seat
31013101
Arguments.PushBoolean ( false ); // jacker
3102+
Arguments.PushBoolean ( false ); // forcedByScript
31023103
pPlayer->CallEvent ( "onPlayerVehicleExit", Arguments );
31033104

31043105
// Call the vehicle->player event
31053106
CLuaArguments Arguments2;
31063107
Arguments2.PushElement ( pPlayer ); // player
31073108
Arguments2.PushNumber ( ucOccupiedSeat ); // seat
31083109
Arguments2.PushBoolean ( false ); // jacker
3110+
Arguments2.PushBoolean ( false ); // forcedByScript
31093111
pVehicle->CallEvent ( "onVehicleExit", Arguments2 );
31103112
}
31113113
}
@@ -3160,13 +3162,15 @@ void CGame::Packet_Vehicle_InOut ( CVehicleInOutPacket& Packet )
31603162
Arguments.PushElement ( pVehicle ); // vehicle
31613163
Arguments.PushNumber ( ucOccupiedSeat ); // seat
31623164
Arguments.PushBoolean ( false ); // jacker
3165+
Arguments.PushBoolean ( false ); // forcedByScript
31633166
pPlayer->CallEvent ( "onPlayerVehicleExit", Arguments );
31643167

31653168
// Call the vehicle->player event
31663169
CLuaArguments Arguments2;
31673170
Arguments2.PushElement ( pPlayer ); // player
31683171
Arguments2.PushNumber ( ucOccupiedSeat ); // seat
31693172
Arguments2.PushBoolean ( false ); // jacker
3173+
Arguments2.PushBoolean ( false ); // forcedByScript
31703174
pVehicle->CallEvent ( "onVehicleExit", Arguments2 );
31713175
}
31723176

@@ -3205,13 +3209,15 @@ void CGame::Packet_Vehicle_InOut ( CVehicleInOutPacket& Packet )
32053209
ArgumentsExit.PushElement ( pVehicle ); // vehicle
32063210
ArgumentsExit.PushNumber ( 0 ); // seat
32073211
ArgumentsExit.PushElement ( pPlayer ); // jacker
3212+
ArgumentsExit.PushBoolean ( false ); // forcedByScript
32083213
pJacked->CallEvent ( "onPlayerVehicleExit", ArgumentsExit );
32093214

32103215
// Execute the vehicle->vehicle script function for the jacked player
32113216
CLuaArguments ArgumentsExit2;
32123217
ArgumentsExit2.PushElement ( pJacked ); // player
32133218
ArgumentsExit2.PushNumber ( 0 ); // seat
32143219
ArgumentsExit2.PushElement ( pPlayer ); // jacker
3220+
ArgumentsExit2.PushBoolean ( false ); // forcedByScript
32153221
pVehicle->CallEvent ( "onVehicleExit", ArgumentsExit2 );
32163222

32173223

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4239,13 +4239,15 @@ bool CStaticFunctionDefinitions::RemovePedFromVehicle ( CElement* pElement )
42394239
Arguments.PushElement ( pVehicle ); // vehicle
42404240
Arguments.PushNumber ( ucOccupiedSeat ); // seat
42414241
Arguments.PushBoolean ( false ); // jacker
4242+
Arguments.PushBoolean ( true ); // forcedByScript
42424243
pPlayer->CallEvent ( "onPlayerVehicleExit", Arguments );
42434244

42444245
// Call the vehicle->player event
42454246
CLuaArguments Arguments2;
42464247
Arguments2.PushElement ( pPlayer ); // player
42474248
Arguments2.PushNumber ( ucOccupiedSeat ); // seat
42484249
Arguments2.PushBoolean ( false ); // jacker
4250+
Arguments2.PushBoolean ( true ); // forcedByScript
42494251
pVehicle->CallEvent ( "onVehicleExit", Arguments2 );
42504252
}
42514253
// Remove him from the vehicle

0 commit comments

Comments
 (0)