From 711b08be75fe33fc940b337dc3a513bea4620a33 Mon Sep 17 00:00:00 2001 From: Seanghost117 <36561158+Seanghost117@users.noreply.github.com> Date: Sat, 18 Mar 2023 12:52:44 -0700 Subject: [PATCH] revert: Increase Damage (#1108) Part of the changes made in #889 --- .../looped/weapons/increase_damage.cpp | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/src/backend/looped/weapons/increase_damage.cpp b/src/backend/looped/weapons/increase_damage.cpp index d8b60a5e..db78cce1 100644 --- a/src/backend/looped/weapons/increase_damage.cpp +++ b/src/backend/looped/weapons/increase_damage.cpp @@ -8,41 +8,24 @@ namespace big { using looped_command::looped_command; - CWeaponInfo* p_modified_weapon = nullptr; - float og_damage = 0.0f; - virtual void on_tick() override { - if (!g_local_player) + if (g.weapons.increased_damage != 1) { - return; - } - - if (g_local_player->m_weapon_manager) - { - if (p_modified_weapon != g_local_player->m_weapon_manager->m_weapon_info - && g_local_player->m_weapon_manager->m_weapon_info) - { - if (p_modified_weapon) - p_modified_weapon->m_damage = og_damage; - - og_damage = g_local_player->m_weapon_manager->m_weapon_info->m_damage; - p_modified_weapon = g_local_player->m_weapon_manager->m_weapon_info; - g_local_player->m_weapon_manager->m_weapon_info->m_damage = g.weapons.increased_damage; - } + Hash weapon{}; + WEAPON::GET_CURRENT_PED_WEAPON(self::ped, &weapon, 0); + WEAPON::SET_WEAPON_DAMAGE_MODIFIER(weapon, g.weapons.increased_damage); } } virtual void on_disable() override { - if (g_local_player && p_modified_weapon) - { - p_modified_weapon->m_damage = og_damage; - p_modified_weapon = nullptr; - } + Hash weapon{}; + WEAPON::GET_CURRENT_PED_WEAPON(self::ped, &weapon, 0); + WEAPON::SET_WEAPON_DAMAGE_MODIFIER(weapon, 1); } }; increased_damage g_increased_damage("incrdamage", "Damage Override", "Sets your damage to whatever you want", g.weapons.increase_damage); -} \ No newline at end of file +}