Launcher script start fix (#2697)

This commit is contained in:
maybegreat48 2024-02-10 13:14:29 +00:00 committed by GitHub
parent b1ad42e3f9
commit 0afcb00ec7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 10 deletions

View File

@ -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<int*>() == state)
if (*script_local(launcher->m_stack, 236).at(plyr->id(), 3).at(2).as<int*>() == 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<int*>(), 1); // run immediately
*scr_globals::launcher_global.at(2).as<int*>() = 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<int*>() = 6;
*script_local(launcher->m_stack, 236).at(self::id, 3).at(2).as<int*>() = 6;
*scr_globals::launcher_global.at(3).at(1).as<int*>() = script_id;
launcher->m_context.m_state = rage::eThreadState::running;

View File

@ -63,6 +63,8 @@ namespace
"Instant Delivery",
"0 Ban Risk",
"Discord For Cheap Money",
"10-30m",
"Discord todo",
};
}

View File

@ -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();