Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

cleanup

Browse Source
This commit is contained in:
m 2022-12-21 14:24:36 -06:00
parent bb9e5f3420
commit f166af7e8b
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/client/component/party.cpp
View File

@ -49,8 +49,11 @@ namespace party
{".arena", "usermaparenahash", true}, {".arena", "usermaparenahash", true},
}; };
game::netadr_s saved_target; struct
utils::info_string saved_info_string; {
game::netadr_s host{};
utils::info_string info_string{};
} saved_info_response;
void perform_game_initialization() void perform_game_initialization()
{ {
@ -298,16 +301,15 @@ namespace party
{ {
command::execute("lui_close popup_acceptinginvite", false); command::execute("lui_close popup_acceptinginvite", false);
} }
if (game::Menu_IsMenuOpenAndVisible(0, "generic_waiting_popup_")) if (game::Menu_IsMenuOpenAndVisible(0, "generic_waiting_popup_"))
{ {
command::execute("lui_close generic_waiting_popup_", false); command::execute("lui_close generic_waiting_popup_", false);
} }
} }
bool download_files(const game::netadr_s& target, const utils::info_string& info, bool should_download); bool download_files(const game::netadr_s& target, const utils::info_string& info, bool allow_download);
int confirm_user_download_cb(game::hks::lua_State* state) int user_download_response(game::hks::lua_State* state)
{ {
const auto response = state->m_apistack.base[0].v.boolean; const auto response = state->m_apistack.base[0].v.boolean;
if (!response) if (!response)
@ -315,7 +317,7 @@ namespace party
return 0; return 0;
} }
download_files(saved_target, saved_info_string, true); download_files(saved_info_response.host, saved_info_response.info_string, true);
return 1; return 1;
} }
@ -324,20 +326,26 @@ namespace party
const auto LUI = ui_scripting::get_globals().get("LUI").as<ui_scripting::table>(); const auto LUI = ui_scripting::get_globals().get("LUI").as<ui_scripting::table>();
const auto yes_no_popup_func = LUI.get("yesnopopup").as<ui_scripting::function>(); const auto yes_no_popup_func = LUI.get("yesnopopup").as<ui_scripting::function>();
close_joining_popups();
const ui_scripting::table data_table{}; const ui_scripting::table data_table{};
data_table.set("title", game::UI_SafeTranslateString("MENU_NOTICE")); data_table.set("title", game::UI_SafeTranslateString("MENU_NOTICE"));
data_table.set("text", std::format("Would you like to install required 3rd-party content for this server? (from {})", info.get("sv_wwwBaseUrl"))); data_table.set("text", std::format("Would you like to install required 3rd-party content for this server? (from {})", info.get("sv_wwwBaseUrl")));
data_table.set("callback", confirm_user_download_cb); data_table.set("callback", user_download_response);
close_joining_popups();
yes_no_popup_func(data_table); yes_no_popup_func(data_table);
} }
bool needs_vid_restart = false; bool needs_vid_restart = false;
bool download_files(const game::netadr_s& target, const utils::info_string& info, bool should_download) bool download_files(const game::netadr_s& target, const utils::info_string& info, bool allow_download)
{ {
if (!allow_download)
{
confirm_user_download(target, info);
return true;
}
try try
{ {
std::vector<download::file_t> files{}; std::vector<download::file_t> files{};
@ -348,16 +356,8 @@ namespace party
if (files.size() > 0) if (files.size() > 0)
{ {
if (should_download) download::stop_download();
{ download::start_download(target, info, files);
download::stop_download();
download::start_download(target, info, files);
}
else
{
confirm_user_download(target, info);
}
return true; return true;
} }
else if (needs_restart || needs_vid_restart) else if (needs_restart || needs_vid_restart)
@ -965,8 +965,9 @@ namespace party
return; return;
} }
saved_target = target; saved_info_response = {};
saved_info_string = info; saved_info_response.host = target;
saved_info_response.info_string = info;
if (info.get("challenge") != connect_state.challenge) if (info.get("challenge") != connect_state.challenge)
{ {