XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Allow connecting from the main menu

Browse Source 
Also allows map command from main menu.
This commit is contained in:
joelrau 2021-02-18 17:34:40 +02:00
parent 505dfe7d99
commit 731c103b08
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ namespace party
void perform_game_initialization() void perform_game_initialization()
{ {
command::execute("onlinegame 1", true); command::execute("onlinegame 1", true);
command::execute("xstartprivateparty", true);
command::execute("xblive_privatematch 1", true); command::execute("xblive_privatematch 1", true);
command::execute("startentitlements", true); command::execute("startentitlements", true);
} }
@ -41,13 +42,28 @@ namespace party
return; return;
} }
if (game::Live_SyncOnlineDataFlags(0)) if (game::Live_SyncOnlineDataFlags(0) != 0)
{ {
scheduler::once([=]() // initialize the game after onlinedataflags is 32 (workaround)
if (game::Live_SyncOnlineDataFlags(0) == 32)
{ {
connect_to_party(target, mapname, gametype); scheduler::once([=]()
}, scheduler::pipeline::main, 1s); {
return; command::execute("xstartprivateparty", true);
command::execute("disconnect", true); // 32 -> 0
connect_to_party(target, mapname, gametype);
}, scheduler::pipeline::main, 1s);
return;
}
else
{
scheduler::once([=]()
{
connect_to_party(target, mapname, gametype);
}, scheduler::pipeline::main, 1s);
return;
}
} }
perform_game_initialization(); perform_game_initialization();
@ -174,9 +190,9 @@ namespace party
void start_map(const std::string& mapname) void start_map(const std::string& mapname)
{ {
if (game::Live_SyncOnlineDataFlags(0) != 0) if (game::Live_SyncOnlineDataFlags(0) > 32)
{ {
scheduler::on_game_initialized([mapname]() scheduler::once([=]()
{ {
command::execute("map " + mapname, false); command::execute("map " + mapname, false);
}, scheduler::pipeline::main, 1s); }, scheduler::pipeline::main, 1s);
@ -185,7 +201,7 @@ namespace party
{ {
if (!game::SV_MapExists(mapname.data())) if (!game::SV_MapExists(mapname.data()))
{ {
printf("Map '%s' doesn't exist.", mapname.data()); printf("Map '%s' doesn't exist.\n", mapname.data());
return; return;
} }