ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

fix(TrollPlayer): fixed flip_180 and downgrade_vehicle (#1385)

Browse Source
This commit is contained in:
oPiloto 2023-06-05 16:32:31 -03:00 committed by GitHub
parent 118c9acedc
commit c3d1ffeb5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/commands/player/troll/downgrade_vehicle.cpp
View File

@ -13,7 +13,8 @@ namespace big
{ {
Ped ped = PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(player->id()); Ped ped = PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(player->id());
Vehicle vehicle = PED::GET_VEHICLE_PED_IS_IN(ped, false); Vehicle vehicle = PED::GET_VEHICLE_PED_IS_IN(ped, false);
if (!PED::IS_PED_IN_ANY_VEHICLE(vehicle, true))
if (!PED::IS_PED_IN_ANY_VEHICLE(ped, true))
{ {
g_notification_service->push_warning("Toxic", "Target player is not in a vehicle."); g_notification_service->push_warning("Toxic", "Target player is not in a vehicle.");
} }

32
src/backend/commands/player/troll/flip_180.cpp
View File

@ -11,28 +11,30 @@ namespace big
virtual void execute(player_ptr player, const std::vector<std::uint64_t>& _args, const std::shared_ptr<command_context> ctx) virtual void execute(player_ptr player, const std::vector<std::uint64_t>& _args, const std::shared_ptr<command_context> ctx)
{ {
Entity ent = PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(player->id()); Ped ped = PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(player->id());
float Heading = ENTITY::GET_ENTITY_HEADING(ent); float heading = ENTITY::GET_ENTITY_HEADING(ped);
Vector3 flipCar180Coords = ENTITY::GET_ENTITY_COORDS(ent, 1); Vector3 car_coords = ENTITY::GET_ENTITY_COORDS(ped, 1);
if (!PED::IS_PED_IN_ANY_VEHICLE(ent, true))
if (!PED::IS_PED_IN_ANY_VEHICLE(ped, true))
{ {
g_notification_service->push_warning("Toxic", "Target player is not in any vehicle."); g_notification_service->push_warning("Toxic", "Target player is not in any vehicle.");
} }
else else
{ {
if (entity::take_control_of(ent)) Vehicle vehicle = PED::GET_VEHICLE_PED_IS_USING(ped);
float speed = ENTITY::GET_ENTITY_SPEED(vehicle);
if (entity::take_control_of(vehicle))
{ {
if (Heading > 180.0) if (heading > 180.0)
{ heading -= 180.0;
Heading -= 180.0;
}
else else
{ heading += 180.0;
Heading += 180.0;
ENTITY::SET_ENTITY_COORDS(ent, flipCar180Coords.x, flipCar180Coords.y, flipCar180Coords.z, 0, 0, 0, 1); ENTITY::SET_ENTITY_COORDS(vehicle, car_coords.x, car_coords.y, car_coords.z, 0, 0, 0, 1);
ENTITY::SET_ENTITY_HEADING(ent, Heading); ENTITY::SET_ENTITY_HEADING(vehicle, heading);
VEHICLE::SET_VEHICLE_FORWARD_SPEED(ent, ENTITY::GET_ENTITY_SPEED(ent)); VEHICLE::SET_VEHICLE_FORWARD_SPEED(vehicle, speed);
}
} }
} }
} }