From 8358e73c43dd412ff7d0067ad92d3f79b8719716 Mon Sep 17 00:00:00 2001 From: tyackman <38179522+tyackman@users.noreply.github.com> Date: Tue, 23 Jul 2024 22:44:38 -0500 Subject: [PATCH] Fix Weird Error (#31) --- CMakeLists.txt | 2 +- script/globals/PlayerPersonaData.hpp | 68 ++++++++++++++-------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c37d08b..94f44c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,4 +28,4 @@ target_include_directories(RDR-Classes PRIVATE if(NOT OK) file(READ "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeError.log" LOG) message(STATUS ${LOG}) -endif() \ No newline at end of file +endif() diff --git a/script/globals/PlayerPersonaData.hpp b/script/globals/PlayerPersonaData.hpp index d0aaa89..0a34c5b 100644 --- a/script/globals/PlayerPersonaData.hpp +++ b/script/globals/PlayerPersonaData.hpp @@ -4,41 +4,41 @@ enum class AbilityType : std::uint32_t { - STRANGE_MEDICINE = rage::joaat("NET_PLAYER_ABILITY__STRANGE_MEDICINE"), - FOCUS_FIRE = rage::joaat("NET_PLAYER_ABILITY__FOCUS_FIRE"), - NECESSITY_BREEDS = rage::joaat("NET_PLAYER_ABILITY__NECESSITY_BREEDS"), - THE_GIFT_OF_FOCUS = rage::joaat("NET_PLAYER_ABILITY__THE_GIFT_OF_FOCUS"), - RIDE_LIKE_THE_WIND = rage::joaat("NET_PLAYER_ABILITY__RIDE_LIKE_THE_WIND"), - FOOL_ME_ONCE = rage::joaat("NET_PLAYER_ABILITY__FOOL_ME_ONCE"), - GUNSLINGERS_CHOICE = rage::joaat("NET_PLAYER_ABILITY__GUNSLINGERS_CHOICE"), - COME_BACK_STRONGER = rage::joaat("NET_PLAYER_ABILITY__COME_BACK_STRONGER"), - WINNING_STREAK = rage::joaat("NET_PLAYER_ABILITY__WINNING_STREAK"), - KICK_IN_THE_BUTT = rage::joaat("NET_PLAYER_ABILITY__KICK_IN_THE_BUTT"), - PEAK_CONDITION = rage::joaat("NET_PLAYER_ABILITY__PEAK_CONDITION"), - THE_SHORT_GAME = rage::joaat("NET_PLAYER_ABILITY__THE_SHORT_GAME"), - OVERRIDE_REVENGE_SLOW_TIME = rage::joaat("NET_PLAYER_ABILITY__OVERRIDE_REVENGE_SLOW_TIME"), - IRON_LUNG = rage::joaat("NET_PLAYER_ABILITY__IRON_LUNG"), - THE_UNBLINKING_EYE = rage::joaat("NET_PLAYER_ABILITY__THE_UNBLINKING_EYE"), + STRANGE_MEDICINE = rage::Joaat("NET_PLAYER_ABILITY__STRANGE_MEDICINE"), + FOCUS_FIRE = rage::Joaat("NET_PLAYER_ABILITY__FOCUS_FIRE"), + NECESSITY_BREEDS = rage::Joaat("NET_PLAYER_ABILITY__NECESSITY_BREEDS"), + THE_GIFT_OF_FOCUS = rage::Joaat("NET_PLAYER_ABILITY__THE_GIFT_OF_FOCUS"), + RIDE_LIKE_THE_WIND = rage::Joaat("NET_PLAYER_ABILITY__RIDE_LIKE_THE_WIND"), + FOOL_ME_ONCE = rage::Joaat("NET_PLAYER_ABILITY__FOOL_ME_ONCE"), + GUNSLINGERS_CHOICE = rage::Joaat("NET_PLAYER_ABILITY__GUNSLINGERS_CHOICE"), + COME_BACK_STRONGER = rage::Joaat("NET_PLAYER_ABILITY__COME_BACK_STRONGER"), + WINNING_STREAK = rage::Joaat("NET_PLAYER_ABILITY__WINNING_STREAK"), + KICK_IN_THE_BUTT = rage::Joaat("NET_PLAYER_ABILITY__KICK_IN_THE_BUTT"), + PEAK_CONDITION = rage::Joaat("NET_PLAYER_ABILITY__PEAK_CONDITION"), + THE_SHORT_GAME = rage::Joaat("NET_PLAYER_ABILITY__THE_SHORT_GAME"), + OVERRIDE_REVENGE_SLOW_TIME = rage::Joaat("NET_PLAYER_ABILITY__OVERRIDE_REVENGE_SLOW_TIME"), + IRON_LUNG = rage::Joaat("NET_PLAYER_ABILITY__IRON_LUNG"), + THE_UNBLINKING_EYE = rage::Joaat("NET_PLAYER_ABILITY__THE_UNBLINKING_EYE"), INVALID = 0, - FRIENDS_FOR_LIFE = rage::joaat("NET_PLAYER_ABILITY__FRIENDS_FOR_LIFE"), - NEVER_WITHOUT_ONE = rage::joaat("NET_PLAYER_ABILITY__NEVER_WITHOUT_ONE"), - OF_SINGLE_PURPOSE = rage::joaat("NET_PLAYER_ABILITY__OF_SINGLE_PURPOSE"), - A_MOMENT_TO_RECUPERATE = rage::joaat("NET_PLAYER_ABILITY__A_MOMENT_TO_RECUPERATE"), - SLIPPERY_BASTARD = rage::joaat("NET_PLAYER_ABILITY__SLIPPERY_BASTARD"), - PAINT_IT_BLACK = rage::joaat("NET_PLAYER_ABILITY__PAINT_IT_BLACK"), - TAKE_THE_PAIN_AWAY = rage::joaat("NET_PLAYER_ABILITY__TAKE_THE_PAIN_AWAY"), - EYE_FOR_AN_EYE = rage::joaat("NET_PLAYER_ABILITY__EYE_FOR_AN_EYE"), - COLD_BLOODED = rage::joaat("NET_PLAYER_ABILITY__COLD_BLOODED"), - HUNKER_DOWN = rage::joaat("NET_PLAYER_ABILITY__HUNKER_DOWN"), - QUITE_AN_INSPIRATION = rage::joaat("NET_PLAYER_ABILITY__QUITE_AN_INSPIRATION"), - TO_FIGHT_ANOTHER_DAY = rage::joaat("NET_PLAYER_ABILITY__TO_FIGHT_ANOTHER_DAY"), - HORSEMAN = rage::joaat("NET_PLAYER_ABILITY__HORSEMAN"), - LIVE_FOR_THE_FIGHT = rage::joaat("NET_PLAYER_ABILITY__LIVE_FOR_THE_FIGHT"), - HANGMAN = rage::joaat("NET_PLAYER_ABILITY__HANGMAN"), - STRENGTH_IN_NUMBERS = rage::joaat("NET_PLAYER_ABILITY__STRENGTH_IN_NUMBERS"), - SLOW_AND_STEADY = rage::joaat("NET_PLAYER_ABILITY__SLOW_AND_STEADY"), - LANDONS_PATIENCE = rage::joaat("NET_PLAYER_ABILITY__LANDONS_PATIENCE"), - SHARPSHOOTER = rage::joaat("NET_PLAYER_ABILITY__SHARPSHOOTER") + FRIENDS_FOR_LIFE = rage::Joaat("NET_PLAYER_ABILITY__FRIENDS_FOR_LIFE"), + NEVER_WITHOUT_ONE = rage::Joaat("NET_PLAYER_ABILITY__NEVER_WITHOUT_ONE"), + OF_SINGLE_PURPOSE = rage::Joaat("NET_PLAYER_ABILITY__OF_SINGLE_PURPOSE"), + A_MOMENT_TO_RECUPERATE = rage::Joaat("NET_PLAYER_ABILITY__A_MOMENT_TO_RECUPERATE"), + SLIPPERY_BASTARD = rage::Joaat("NET_PLAYER_ABILITY__SLIPPERY_BASTARD"), + PAINT_IT_BLACK = rage::Joaat("NET_PLAYER_ABILITY__PAINT_IT_BLACK"), + TAKE_THE_PAIN_AWAY = rage::Joaat("NET_PLAYER_ABILITY__TAKE_THE_PAIN_AWAY"), + EYE_FOR_AN_EYE = rage::Joaat("NET_PLAYER_ABILITY__EYE_FOR_AN_EYE"), + COLD_BLOODED = rage::Joaat("NET_PLAYER_ABILITY__COLD_BLOODED"), + HUNKER_DOWN = rage::Joaat("NET_PLAYER_ABILITY__HUNKER_DOWN"), + QUITE_AN_INSPIRATION = rage::Joaat("NET_PLAYER_ABILITY__QUITE_AN_INSPIRATION"), + TO_FIGHT_ANOTHER_DAY = rage::Joaat("NET_PLAYER_ABILITY__TO_FIGHT_ANOTHER_DAY"), + HORSEMAN = rage::Joaat("NET_PLAYER_ABILITY__HORSEMAN"), + LIVE_FOR_THE_FIGHT = rage::Joaat("NET_PLAYER_ABILITY__LIVE_FOR_THE_FIGHT"), + HANGMAN = rage::Joaat("NET_PLAYER_ABILITY__HANGMAN"), + STRENGTH_IN_NUMBERS = rage::Joaat("NET_PLAYER_ABILITY__STRENGTH_IN_NUMBERS"), + SLOW_AND_STEADY = rage::Joaat("NET_PLAYER_ABILITY__SLOW_AND_STEADY"), + LANDONS_PATIENCE = rage::Joaat("NET_PLAYER_ABILITY__LANDONS_PATIENCE"), + SHARPSHOOTER = rage::Joaat("NET_PLAYER_ABILITY__SHARPSHOOTER") }; enum class OutfitTheme