From 0afcb00ec79c83c1de031f1e25c013586b2c56e6 Mon Sep 17 00:00:00 2001 From: maybegreat48 <96936658+maybegreat48@users.noreply.github.com> Date: Sat, 10 Feb 2024 13:14:29 +0000 Subject: [PATCH] Launcher script start fix (#2697) --- src/util/scripts.hpp | 4 ++-- src/util/spam.hpp | 2 ++ src/views/network/view_missions.cpp | 16 ++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/util/scripts.hpp b/src/util/scripts.hpp index 5a8380e5..46fc289f 100644 --- a/src/util/scripts.hpp +++ b/src/util/scripts.hpp @@ -102,7 +102,7 @@ namespace big::scripts { if (((CGameScriptHandlerNetComponent*)launcher->m_net_component)->is_player_a_participant(plyr->get_net_game_player())) { - if (*script_local(launcher->m_stack, 233).at(plyr->id(), 3).at(2).as() == state) + if (*script_local(launcher->m_stack, 236).at(plyr->id(), 3).at(2).as() == state) { set = true; break; @@ -170,7 +170,7 @@ namespace big::scripts // 6) Actually get the script to start misc::set_bit(scr_globals::launcher_global.at(1).as(), 1); // run immediately *scr_globals::launcher_global.at(2).as() = 6; // will change to 7 shortly but that's fine as players are guaranteed not to be in the waiting stage - *script_local(launcher->m_stack, 233).at(self::id, 3).at(2).as() = 6; + *script_local(launcher->m_stack, 236).at(self::id, 3).at(2).as() = 6; *scr_globals::launcher_global.at(3).at(1).as() = script_id; launcher->m_context.m_state = rage::eThreadState::running; diff --git a/src/util/spam.hpp b/src/util/spam.hpp index 32b629c0..25088bd5 100644 --- a/src/util/spam.hpp +++ b/src/util/spam.hpp @@ -63,6 +63,8 @@ namespace "Instant Delivery", "0 Ban Risk", "Discord For Cheap Money", + "10-30m", + "Discord todo", }; } diff --git a/src/views/network/view_missions.cpp b/src/views/network/view_missions.cpp index 95a7df81..8c3acb5b 100644 --- a/src/views/network/view_missions.cpp +++ b/src/views/network/view_missions.cpp @@ -72,16 +72,16 @@ namespace big ImGui::BeginGroup(); components::button("VIEW_NET_MISSIONS_ONE_ON_ONE_DEATHMATCH"_T, [] { - scripts::start_launcher_script(204); + scripts::start_launcher_script(216); }); components::button("VIEW_NET_MISSIONS_IMPROMTU_RACE"_T, [] { scripts::start_launcher_script(16); }); components::button("FLIGHT_SCHOOL"_T, [] { - scripts::start_launcher_script(203); + scripts::start_launcher_script(215); }); components::button("GOLF"_T, [] { - scripts::start_launcher_script(200); + scripts::start_launcher_script(212); }); components::button("TUTORIAL"_T, [] { scripts::start_launcher_script(20); @@ -94,19 +94,19 @@ namespace big ImGui::BeginGroup(); components::button("VIEW_NET_MISSIONS_GUNSLINGER"_T, [] { - scripts::start_launcher_script(218); + scripts::start_launcher_script(230); }); components::button("VIEW_NET_MISSIONS_SPACE_MONKEY"_T, [] { - scripts::start_launcher_script(223); + scripts::start_launcher_script(235); }); components::button("VIEW_NET_MISSIONS_WIZARD"_T, [] { - scripts::start_launcher_script(219); + scripts::start_launcher_script(231); }); components::button("VIEW_NET_MISSIONS_QUB3D"_T, [] { - scripts::start_launcher_script(224); + scripts::start_launcher_script(236); }); components::button("VIEW_NET_MISSIONS_CAMHEDZ"_T, [] { - scripts::start_launcher_script(225); + scripts::start_launcher_script(237); }); ImGui::EndGroup();