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

Remove DROWN flag and replace it with WATER flag. (#2863)

Browse Source
This commit is contained in:
gir489 2024-03-22 17:19:57 -04:00 committed by GitHub
parent 3f1921e835
commit 313bfa24b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/enums.hpp
View File

@ -293,8 +293,7 @@ namespace big
GOD = 1 << 8, GOD = 1 << 8,
EXPLOSION = 1 << 11, EXPLOSION = 1 << 11,
STEAM = 1 << 15, STEAM = 1 << 15,
DROWN = 1 << 16, WATER = 1 << 16,
WATER = 1 << 24,
}; };
enum ePedType : uint32_t enum ePedType : uint32_t
{ {

3
src/core/settings.hpp
View File

@ -336,7 +336,6 @@ namespace big
bool proof_melee = false; bool proof_melee = false;
bool proof_explosion = false; bool proof_explosion = false;
bool proof_steam = false; bool proof_steam = false;
bool proof_drown = false;
bool proof_water = false; bool proof_water = false;
uint32_t proof_mask = 0; uint32_t proof_mask = 0;
bool mobile_radio = false; 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) NLOHMANN_DEFINE_TYPE_INTRUSIVE(super_hero_fly, gradual, explosions, auto_land, charge, ptfx, fly_speed, initial_launch)
} super_hero_fly{}; } 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{}; } self{};
struct session struct session

7
src/views/self/view_self.cpp
View File

@ -233,7 +233,6 @@ namespace big
g.self.proof_melee = true; g.self.proof_melee = true;
g.self.proof_explosion = true; g.self.proof_explosion = true;
g.self.proof_steam = true; g.self.proof_steam = true;
g.self.proof_drown = true;
g.self.proof_water = true; g.self.proof_water = true;
} }
@ -247,7 +246,6 @@ namespace big
g.self.proof_melee = false; g.self.proof_melee = false;
g.self.proof_explosion = false; g.self.proof_explosion = false;
g.self.proof_steam = false; g.self.proof_steam = false;
g.self.proof_drown = false;
g.self.proof_water = false; g.self.proof_water = false;
} }
@ -274,7 +272,6 @@ namespace big
ImGui::SameLine(); ImGui::SameLine();
ImGui::BeginGroup(); ImGui::BeginGroup();
ImGui::Checkbox("DROWN"_T.data(), &g.self.proof_drown);
ImGui::Checkbox("WATER"_T.data(), &g.self.proof_water); ImGui::Checkbox("WATER"_T.data(), &g.self.proof_water);
ImGui::EndGroup(); ImGui::EndGroup();
@ -408,10 +405,6 @@ namespace big
{ {
g.self.proof_mask |= static_cast<int>(eEntityProofs::STEAM); g.self.proof_mask |= static_cast<int>(eEntityProofs::STEAM);
} }
if (g.self.proof_drown)
{
g.self.proof_mask |= static_cast<int>(eEntityProofs::DROWN);
}
if (g.self.proof_water) if (g.self.proof_water)
{ {
g.self.proof_mask |= static_cast<int>(eEntityProofs::WATER); g.self.proof_mask |= static_cast<int>(eEntityProofs::WATER);