From 313bfa24b3cf019d6583181eea3f9af6b2207a93 Mon Sep 17 00:00:00 2001 From: gir489 <100792176+gir489returns@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:19:57 -0400 Subject: [PATCH] Remove DROWN flag and replace it with WATER flag. (#2863) --- src/core/enums.hpp | 3 +-- src/core/settings.hpp | 3 +-- src/views/self/view_self.cpp | 7 ------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/core/enums.hpp b/src/core/enums.hpp index 384b91aa..2f87ff3b 100644 --- a/src/core/enums.hpp +++ b/src/core/enums.hpp @@ -293,8 +293,7 @@ namespace big GOD = 1 << 8, EXPLOSION = 1 << 11, STEAM = 1 << 15, - DROWN = 1 << 16, - WATER = 1 << 24, + WATER = 1 << 16, }; enum ePedType : uint32_t { diff --git a/src/core/settings.hpp b/src/core/settings.hpp index 44f7f9f6..74723fd1 100644 --- a/src/core/settings.hpp +++ b/src/core/settings.hpp @@ -336,7 +336,6 @@ namespace big bool proof_melee = false; bool proof_explosion = false; bool proof_steam = false; - bool proof_drown = false; bool proof_water = false; uint32_t proof_mask = 0; bool mobile_radio = false; @@ -388,7 +387,7 @@ namespace big NLOHMANN_DEFINE_TYPE_INTRUSIVE(super_hero_fly, gradual, explosions, auto_land, charge, ptfx, fly_speed, initial_launch) } super_hero_fly{}; - NLOHMANN_DEFINE_TYPE_INTRUSIVE(self, ipls, ptfx_effects, clean_player, force_wanted_level, passive, free_cam, invisibility, local_visibility, never_wanted, no_ragdoll, noclip, noclip_aim_speed_multiplier, noclip_speed_multiplier, off_radar, super_run, no_collision, unlimited_oxygen, no_water_collision, wanted_level, god_mode, part_water, proof_bullet, proof_fire, proof_collision, proof_melee, proof_explosion, proof_steam, proof_drown, proof_water, proof_mask, mobile_radio, fast_respawn, auto_tp, super_jump, beast_jump, healthregen, healthregenrate, hud, superman, custom_weapon_stop, prompt_ambient_animations, persist_outfit, persist_outfits_mis, interaction_menu_freedom, super_hero_fly) + NLOHMANN_DEFINE_TYPE_INTRUSIVE(self, ipls, ptfx_effects, clean_player, force_wanted_level, passive, free_cam, invisibility, local_visibility, never_wanted, no_ragdoll, noclip, noclip_aim_speed_multiplier, noclip_speed_multiplier, off_radar, super_run, no_collision, unlimited_oxygen, no_water_collision, wanted_level, god_mode, part_water, proof_bullet, proof_fire, proof_collision, proof_melee, proof_explosion, proof_steam, proof_water, proof_mask, mobile_radio, fast_respawn, auto_tp, super_jump, beast_jump, healthregen, healthregenrate, hud, superman, custom_weapon_stop, prompt_ambient_animations, persist_outfit, persist_outfits_mis, interaction_menu_freedom, super_hero_fly) } self{}; struct session diff --git a/src/views/self/view_self.cpp b/src/views/self/view_self.cpp index a8ba77bb..ed68eb14 100644 --- a/src/views/self/view_self.cpp +++ b/src/views/self/view_self.cpp @@ -233,7 +233,6 @@ namespace big g.self.proof_melee = true; g.self.proof_explosion = true; g.self.proof_steam = true; - g.self.proof_drown = true; g.self.proof_water = true; } @@ -247,7 +246,6 @@ namespace big g.self.proof_melee = false; g.self.proof_explosion = false; g.self.proof_steam = false; - g.self.proof_drown = false; g.self.proof_water = false; } @@ -274,7 +272,6 @@ namespace big ImGui::SameLine(); ImGui::BeginGroup(); - ImGui::Checkbox("DROWN"_T.data(), &g.self.proof_drown); ImGui::Checkbox("WATER"_T.data(), &g.self.proof_water); ImGui::EndGroup(); @@ -408,10 +405,6 @@ namespace big { g.self.proof_mask |= static_cast(eEntityProofs::STEAM); } - if (g.self.proof_drown) - { - g.self.proof_mask |= static_cast(eEntityProofs::DROWN); - } if (g.self.proof_water) { g.self.proof_mask |= static_cast(eEntityProofs::WATER);