From 777173d67c3a38c994711fe9ec28fbef84eb2cb1 Mon Sep 17 00:00:00 2001 From: Yimura Date: Fri, 15 Jan 2021 22:56:58 +0100 Subject: [PATCH] refactor(Features/looped): Resorted files into sub dirs --- BigBaseV2/src/features/looped/{ => self}/god_mode.cpp | 2 +- .../src/features/looped/{ => self}/never_wanted.cpp | 0 .../src/features/looped/{ => self}/no_ragdoll.cpp | 2 +- BigBaseV2/src/features/looped/{ => self}/noclip.cpp | 2 +- .../src/features/looped/{ => self}/off_radar.cpp | 0 .../src/features/looped/{ => self}/spoof_rank.cpp | 0 .../src/features/looped/{ => self}/super_sprint.cpp | 2 +- .../looped/{util => system}/update_player_structs.cpp | 0 .../looped/{util => system}/update_screen_sizes.cpp | 0 .../src/features/looped/tunables/disable_phone.cpp | 11 +++++++++++ .../features/looped/{ => tunables}/no_idle_kick.cpp | 0 .../features/looped/{ => util}/spectate_player.cpp | 0 .../features/looped/{ => vehicle}/no_bike_fall.cpp | 2 +- .../features/looped/{ => vehicle}/speedo_meter.cpp | 0 .../features/looped/{ => vehicle}/sticky_tyres.cpp | 0 .../looped/{ => world}/population_modifiers.cpp | 2 +- 16 files changed, 17 insertions(+), 6 deletions(-) rename BigBaseV2/src/features/looped/{ => self}/god_mode.cpp (93%) rename BigBaseV2/src/features/looped/{ => self}/never_wanted.cpp (100%) rename BigBaseV2/src/features/looped/{ => self}/no_ragdoll.cpp (94%) rename BigBaseV2/src/features/looped/{ => self}/noclip.cpp (99%) rename BigBaseV2/src/features/looped/{ => self}/off_radar.cpp (100%) rename BigBaseV2/src/features/looped/{ => self}/spoof_rank.cpp (100%) rename BigBaseV2/src/features/looped/{ => self}/super_sprint.cpp (95%) rename BigBaseV2/src/features/looped/{util => system}/update_player_structs.cpp (100%) rename BigBaseV2/src/features/looped/{util => system}/update_screen_sizes.cpp (100%) create mode 100644 BigBaseV2/src/features/looped/tunables/disable_phone.cpp rename BigBaseV2/src/features/looped/{ => tunables}/no_idle_kick.cpp (100%) rename BigBaseV2/src/features/looped/{ => util}/spectate_player.cpp (100%) rename BigBaseV2/src/features/looped/{ => vehicle}/no_bike_fall.cpp (89%) rename BigBaseV2/src/features/looped/{ => vehicle}/speedo_meter.cpp (100%) rename BigBaseV2/src/features/looped/{ => vehicle}/sticky_tyres.cpp (100%) rename BigBaseV2/src/features/looped/{ => world}/population_modifiers.cpp (99%) diff --git a/BigBaseV2/src/features/looped/god_mode.cpp b/BigBaseV2/src/features/looped/self/god_mode.cpp similarity index 93% rename from BigBaseV2/src/features/looped/god_mode.cpp rename to BigBaseV2/src/features/looped/self/god_mode.cpp index 4b8484ec..22580459 100644 --- a/BigBaseV2/src/features/looped/god_mode.cpp +++ b/BigBaseV2/src/features/looped/self/god_mode.cpp @@ -15,7 +15,7 @@ namespace big ENTITY::SET_ENTITY_INVINCIBLE(PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(g_playerId), bGodMode); }QUEUE_JOB_END_CLAUSE - bLastGodMode = bGodMode; + bLastGodMode = bGodMode; } } } \ No newline at end of file diff --git a/BigBaseV2/src/features/looped/never_wanted.cpp b/BigBaseV2/src/features/looped/self/never_wanted.cpp similarity index 100% rename from BigBaseV2/src/features/looped/never_wanted.cpp rename to BigBaseV2/src/features/looped/self/never_wanted.cpp diff --git a/BigBaseV2/src/features/looped/no_ragdoll.cpp b/BigBaseV2/src/features/looped/self/no_ragdoll.cpp similarity index 94% rename from BigBaseV2/src/features/looped/no_ragdoll.cpp rename to BigBaseV2/src/features/looped/self/no_ragdoll.cpp index d8acb9d9..6cce032e 100644 --- a/BigBaseV2/src/features/looped/no_ragdoll.cpp +++ b/BigBaseV2/src/features/looped/self/no_ragdoll.cpp @@ -19,7 +19,7 @@ namespace big PED::SET_PED_RAGDOLL_ON_COLLISION(player, !bNoRagdoll); }QUEUE_JOB_END_CLAUSE - bLastNoRagdoll = bNoRagdoll; + bLastNoRagdoll = bNoRagdoll; } } } \ No newline at end of file diff --git a/BigBaseV2/src/features/looped/noclip.cpp b/BigBaseV2/src/features/looped/self/noclip.cpp similarity index 99% rename from BigBaseV2/src/features/looped/noclip.cpp rename to BigBaseV2/src/features/looped/self/noclip.cpp index 3d63fa14..18a04921 100644 --- a/BigBaseV2/src/features/looped/noclip.cpp +++ b/BigBaseV2/src/features/looped/self/noclip.cpp @@ -67,7 +67,7 @@ namespace big else if (!bNoclip && bNoclip != bLastNoClip) { functions::take_control_of_entity(ent); - + ENTITY::SET_ENTITY_COLLISION(ent, true, true); } diff --git a/BigBaseV2/src/features/looped/off_radar.cpp b/BigBaseV2/src/features/looped/self/off_radar.cpp similarity index 100% rename from BigBaseV2/src/features/looped/off_radar.cpp rename to BigBaseV2/src/features/looped/self/off_radar.cpp diff --git a/BigBaseV2/src/features/looped/spoof_rank.cpp b/BigBaseV2/src/features/looped/self/spoof_rank.cpp similarity index 100% rename from BigBaseV2/src/features/looped/spoof_rank.cpp rename to BigBaseV2/src/features/looped/self/spoof_rank.cpp diff --git a/BigBaseV2/src/features/looped/super_sprint.cpp b/BigBaseV2/src/features/looped/self/super_sprint.cpp similarity index 95% rename from BigBaseV2/src/features/looped/super_sprint.cpp rename to BigBaseV2/src/features/looped/self/super_sprint.cpp index 0e3eea84..e2ee1322 100644 --- a/BigBaseV2/src/features/looped/super_sprint.cpp +++ b/BigBaseV2/src/features/looped/self/super_sprint.cpp @@ -12,7 +12,7 @@ namespace big if (PED::IS_PED_IN_ANY_VEHICLE(player, true)) return; bool bSuperSprint = g_settings.options["super_sprint"].get(); - + if (bSuperSprint) { float height = ENTITY::GET_ENTITY_HEIGHT_ABOVE_GROUND(player); diff --git a/BigBaseV2/src/features/looped/util/update_player_structs.cpp b/BigBaseV2/src/features/looped/system/update_player_structs.cpp similarity index 100% rename from BigBaseV2/src/features/looped/util/update_player_structs.cpp rename to BigBaseV2/src/features/looped/system/update_player_structs.cpp diff --git a/BigBaseV2/src/features/looped/util/update_screen_sizes.cpp b/BigBaseV2/src/features/looped/system/update_screen_sizes.cpp similarity index 100% rename from BigBaseV2/src/features/looped/util/update_screen_sizes.cpp rename to BigBaseV2/src/features/looped/system/update_screen_sizes.cpp diff --git a/BigBaseV2/src/features/looped/tunables/disable_phone.cpp b/BigBaseV2/src/features/looped/tunables/disable_phone.cpp new file mode 100644 index 00000000..901d28f4 --- /dev/null +++ b/BigBaseV2/src/features/looped/tunables/disable_phone.cpp @@ -0,0 +1,11 @@ +#include "features.hpp" +#include "script_global.hpp" + +namespace big +{ + void features::disable_phone() + { + if (g_settings.options["disable_phone"]) + *script_global(19664).as() = 1; + } +} \ No newline at end of file diff --git a/BigBaseV2/src/features/looped/no_idle_kick.cpp b/BigBaseV2/src/features/looped/tunables/no_idle_kick.cpp similarity index 100% rename from BigBaseV2/src/features/looped/no_idle_kick.cpp rename to BigBaseV2/src/features/looped/tunables/no_idle_kick.cpp diff --git a/BigBaseV2/src/features/looped/spectate_player.cpp b/BigBaseV2/src/features/looped/util/spectate_player.cpp similarity index 100% rename from BigBaseV2/src/features/looped/spectate_player.cpp rename to BigBaseV2/src/features/looped/util/spectate_player.cpp diff --git a/BigBaseV2/src/features/looped/no_bike_fall.cpp b/BigBaseV2/src/features/looped/vehicle/no_bike_fall.cpp similarity index 89% rename from BigBaseV2/src/features/looped/no_bike_fall.cpp rename to BigBaseV2/src/features/looped/vehicle/no_bike_fall.cpp index 8f1cf0b1..8c83ff02 100644 --- a/BigBaseV2/src/features/looped/no_bike_fall.cpp +++ b/BigBaseV2/src/features/looped/vehicle/no_bike_fall.cpp @@ -6,7 +6,7 @@ namespace big { bool bNoBikeFall = g_settings.options["no_bike_fall"].get(); - QUEUE_JOB_BEGIN_CLAUSE(=) + QUEUE_JOB_BEGIN_CLAUSE(= ) { PED::SET_PED_CAN_BE_KNOCKED_OFF_VEHICLE(PLAYER::PLAYER_PED_ID(), bNoBikeFall); }QUEUE_JOB_END_CLAUSE diff --git a/BigBaseV2/src/features/looped/speedo_meter.cpp b/BigBaseV2/src/features/looped/vehicle/speedo_meter.cpp similarity index 100% rename from BigBaseV2/src/features/looped/speedo_meter.cpp rename to BigBaseV2/src/features/looped/vehicle/speedo_meter.cpp diff --git a/BigBaseV2/src/features/looped/sticky_tyres.cpp b/BigBaseV2/src/features/looped/vehicle/sticky_tyres.cpp similarity index 100% rename from BigBaseV2/src/features/looped/sticky_tyres.cpp rename to BigBaseV2/src/features/looped/vehicle/sticky_tyres.cpp diff --git a/BigBaseV2/src/features/looped/population_modifiers.cpp b/BigBaseV2/src/features/looped/world/population_modifiers.cpp similarity index 99% rename from BigBaseV2/src/features/looped/population_modifiers.cpp rename to BigBaseV2/src/features/looped/world/population_modifiers.cpp index 965cf2da..a08225b8 100644 --- a/BigBaseV2/src/features/looped/population_modifiers.cpp +++ b/BigBaseV2/src/features/looped/world/population_modifiers.cpp @@ -9,7 +9,7 @@ namespace big QUEUE_JOB_BEGIN_CLAUSE() { PED::SET_PED_DENSITY_MULTIPLIER_THIS_FRAME((float)g_settings.options["pedestrian_population"].get()); - + VEHICLE::SET_PARKED_VEHICLE_DENSITY_MULTIPLIER_THIS_FRAME((float)g_settings.options["parked_vehicle_density"].get()); VEHICLE::SET_VEHICLE_DENSITY_MULTIPLIER_THIS_FRAME((float)g_settings.options["vehicle_density"].get()); }QUEUE_JOB_END_CLAUSE