From c36981a0e403b96956d245fb1e045e532c3ea949 Mon Sep 17 00:00:00 2001 From: gir489 <100792176+gir489returns@users.noreply.github.com> Date: Fri, 23 Aug 2024 17:49:11 -0400 Subject: [PATCH] Incorporate eThreadState changes (#3558) --- cmake/gtav-classes.cmake | 2 +- src/backend/commands/player/toxic/turn_into_beast.cpp | 2 +- src/services/gta_data/gta_data_service.cpp | 2 +- src/services/script_connection/script_connection.cpp | 2 +- src/util/scripts.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/gtav-classes.cmake b/cmake/gtav-classes.cmake index 079284b4..c0125956 100644 --- a/cmake/gtav-classes.cmake +++ b/cmake/gtav-classes.cmake @@ -3,7 +3,7 @@ include(FetchContent) FetchContent_Declare( gtav_classes GIT_REPOSITORY https://github.com/Yimura/GTAV-Classes.git - GIT_TAG aebd69542e58fab8975da76c3e555b122ddef5d6 + GIT_TAG 21cbc2076b8d0ac9cbd98d05ebabadcced546f30 GIT_PROGRESS TRUE CONFIGURE_COMMAND "" BUILD_COMMAND "" diff --git a/src/backend/commands/player/toxic/turn_into_beast.cpp b/src/backend/commands/player/toxic/turn_into_beast.cpp index 6a8c839b..4d6213d7 100644 --- a/src/backend/commands/player/toxic/turn_into_beast.cpp +++ b/src/backend/commands/player/toxic/turn_into_beast.cpp @@ -117,7 +117,7 @@ namespace big if (!stack || !net_component) return; - thread->m_context.m_state = rage::eThreadState::unk_3; + thread->m_context.m_state = rage::eThreadState::paused; g.m_hunt_the_beast_thread = thread; for (int i = 0; i < 15; i++) diff --git a/src/services/gta_data/gta_data_service.cpp b/src/services/gta_data/gta_data_service.cpp index d0c68164..eca9c22e 100644 --- a/src/services/gta_data/gta_data_service.cpp +++ b/src/services/gta_data/gta_data_service.cpp @@ -369,7 +369,7 @@ namespace big mp_weapons_thread_id = SYSTEM::START_NEW_SCRIPT_WITH_NAME_HASH(script_hash, 1424); auto thread = gta_util::find_script_thread_by_id(mp_weapons_thread_id); if (thread) - thread->m_context.m_state = rage::eThreadState::unk_3; + thread->m_context.m_state = rage::eThreadState::paused; else LOG(FATAL) << "Failed to find MP_Weapons script!"; SCRIPT::SET_SCRIPT_WITH_NAME_HASH_AS_NO_LONGER_NEEDED(script_hash); diff --git a/src/services/script_connection/script_connection.cpp b/src/services/script_connection/script_connection.cpp index 8fa099de..ed1670e9 100644 --- a/src/services/script_connection/script_connection.cpp +++ b/src/services/script_connection/script_connection.cpp @@ -35,7 +35,7 @@ namespace big if (!m_thread) return false; - m_thread->m_context.m_state = rage::eThreadState::unk_3; + m_thread->m_context.m_state = rage::eThreadState::paused; return true; } diff --git a/src/util/scripts.hpp b/src/util/scripts.hpp index 790bb9bb..366bc69d 100644 --- a/src/util/scripts.hpp +++ b/src/util/scripts.hpp @@ -127,7 +127,7 @@ namespace big::scripts return; } - launcher->m_context.m_state = rage::eThreadState::unk_3; // prevent bad things from happening to the thread in the meantime + launcher->m_context.m_state = rage::eThreadState::paused; // prevent bad things from happening to the thread in the meantime // 3) Remove players from that annoying waiting stage if (check_players_in_state(launcher, 5))