ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow creating wan server in command line

Browse Source 
It can only be used with a saved online player, also fix a weird
crash if server failed to create (wan is NULL)
This commit is contained in:
Benau 2018-02-20 15:11:58 +08:00
parent 22c755a328
commit 8daebe06e1
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main.cpp
View File

@ -579,7 +579,7 @@ void cmdLineHelp()
// " --test-ai=n Use the test-ai for every n-th AI kart.\n"
// " (so n=1 means all Ais will be the test ai)\n"
// "
" --server=name Start a server (not a playing client).\n"
" --wan-server=name Start a Wan server (not a playing client).\n"
" --public-server Allow direct connection to the server (without stk server)\n"
" --lan-server=name Start a LAN server (not a playing client).\n"
" --server-password= Sets a password for a server (both client&server).\n"
@ -1018,13 +1018,30 @@ int handleCmdLine()
STKHost::create();
}
if(CommandLine::has("--server", &s))
if (CommandLine::has("--wan-server", &s))
{
NetworkConfig::get()->setServerName(core::stringw(s.c_str()));
NetworkConfig::get()->setIsServer(true);
NetworkConfig::get()->setIsWAN();
STKHost::create();
Log::info("main", "Creating a WAN server '%s'.", s.c_str());
PlayerProfile* player = PlayerManager::getCurrentPlayer();
if (player && player->wasOnlineLastTime() && player->wasOnlineLastTime() &&
player->hasSavedSession())
{
while (true)
{
Online::RequestManager::get()->update(0.0f);
if (PlayerManager::getCurrentOnlineState() == PlayerProfile::OS_SIGNED_IN)
{
break;
}
}
NetworkConfig::get()->setServerName(core::stringw(s.c_str()));
NetworkConfig::get()->setIsServer(true);
NetworkConfig::get()->setIsWAN();
STKHost::create();
Log::info("main", "Creating a WAN server '%s'.", s.c_str());
}
else
{
Log::warn("main", "No saved online player session to create a wan server");
}
}
if (CommandLine::has("--lan-server", &s))
{

8
src/states_screens/online_screen.cpp
View File

@ -71,7 +71,6 @@ void OnlineScreen::loadedFromFile()
void OnlineScreen::beforeAddingWidget()
{
bool is_logged_in = false;
PlayerProfile *player = PlayerManager::getCurrentPlayer();
if (PlayerManager::getCurrentOnlineState() == PlayerProfile::OS_GUEST ||
PlayerManager::getCurrentOnlineState() == PlayerProfile::OS_SIGNED_IN)
{
@ -79,8 +78,11 @@ void OnlineScreen::beforeAddingWidget()
}
IconButtonWidget* wan = getWidget<IconButtonWidget>("wan");
wan->setActive(is_logged_in);
wan->setVisible(is_logged_in);
if (wan)
{
wan->setActive(is_logged_in);
wan->setVisible(is_logged_in);
}
} // beforeAddingWidget
// ----------------------------------------------------------------------------