fly/flightgear
1
0
Fork 0
Code Activity

Split multiplayer command

Browse source 
better split into
multiplayer-connect
multiplayer-disconnect
miltiplayer-refreshserverlist
This commit is contained in:
Torsten Dreyer 2015-03-12 09:18:41 +01:00
parent 1e1326d8f3
commit b21bb90ae5
1 changed files with 85 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/MultiPlayer/multiplaymgr.cxx
View file

@ -368,31 +368,23 @@ private:
//////////////////////////////////////////////////////////////////////
//
// handle command "multiplayer"
// command: connect|disconnect|refreshserverlist
//
// connect args:
// handle command "multiplayer-connect"
// args:
// server: servername to connect (mandatory)
// txport: outgoing port number (default: 5000)
// rxport: incoming port number (default: 5000)
//
// disconnect args:
// none
//
// refreshserverlist args:
// none
//
//////////////////////////////////////////////////////////////////////
static bool do_multiplayer (const SGPropertyNode * arg)
{
static bool do_multiplayer_connect(const SGPropertyNode * arg) {
FGMultiplayMgr * self = (FGMultiplayMgr*) globals->get_subsystem("mp");
if (!self) {
SG_LOG(SG_NETWORK, SG_WARN, "Multiplayer subsystem not available.");
return false;
}
const string &command = arg->getStringValue("command", "");
SG_LOG(SG_NETWORK, SG_WARN, "do_multiplayer: " << command );
if( command == "connect" ) {
string servername = arg->getStringValue("servername", "");
if (servername.empty()) {
SG_LOG(SG_NETWORK, SG_WARN, "do_multiplayer.connect: no server name given, command ignored." );
SG_LOG(SG_NETWORK, SG_WARN,
"do_multiplayer.connect: no server name given, command ignored.");
return false;
}
int port = arg->getIntValue("rxport", -1);
@ -409,24 +401,54 @@ static bool do_multiplayer (const SGPropertyNode * arg)
fgSetString("/sim/multiplay/txhost", servername);
self->reinit();
return true;
}
//////////////////////////////////////////////////////////////////////
//
// handle command "multiplayer-disconnect"
// disconnect args:
// none
//////////////////////////////////////////////////////////////////////
static bool do_multiplayer_disconnect(const SGPropertyNode * arg) {
FGMultiplayMgr * self = (FGMultiplayMgr*) globals->get_subsystem("mp");
if (!self) {
SG_LOG(SG_NETWORK, SG_WARN, "Multiplayer subsystem not available.");
return false;
}
} else if( command == "disconnect" ) {
fgSetString("/sim/multiplay/txhost", "");
self->reinit();
return true;
}
} else if( command == "refreshserverlist" ) {
string url(fgGetString("/sim/multiplay/serverlist-url",
"http://liveries.flightgear.org/mpstatus/mpservers.xml" ));
if (url.empty()) {
SG_LOG(SG_IO, SG_ALERT, "do_multiplayer.refreshserverlist: no URL given");
//////////////////////////////////////////////////////////////////////
//
// handle command "multiplayer-refreshserverlist"
// refreshserverlist args:
// none
//
//////////////////////////////////////////////////////////////////////
static bool do_multiplayer_refreshserverlist(const SGPropertyNode * arg) {
FGMultiplayMgr * self = (FGMultiplayMgr*) globals->get_subsystem("mp");
if (!self) {
SG_LOG(SG_NETWORK, SG_WARN, "Multiplayer subsystem not available.");
return false;
}
FGHTTPClient* http = static_cast<FGHTTPClient*>(globals->get_subsystem("http"));
if (!http) {
SG_LOG(SG_IO, SG_ALERT, "do_multiplayer.refreshserverlist: HTTP client not running");
SG_LOG(SG_IO, SG_ALERT,
"do_multiplayer.refreshserverlist: HTTP client not running");
return false;
}
string url(
fgGetString("/sim/multiplay/serverlist-url",
"http://liveries.flightgear.org/mpstatus/mpservers.xml"));
if (url.empty()) {
SG_LOG(SG_IO, SG_ALERT,
"do_multiplayer.refreshserverlist: no URL given");
return false;
}
@ -440,11 +462,6 @@ static bool do_multiplayer (const SGPropertyNode * arg)
failureNode->setBoolValue(false);
http->makeRequest(req);
return true;
} else {
SG_LOG(SG_NETWORK, SG_WARN, "FGMultiplayMgr do_multiplayer: command" << command << " unknown. ignored.");
}
return true;
}
//////////////////////////////////////////////////////////////////////
@ -457,7 +474,9 @@ FGMultiplayMgr::FGMultiplayMgr()
mInitialised = false;
mHaveServer = false;
mListener = NULL;
globals->get_commands()->addCommand("multiplayer", do_multiplayer);
globals->get_commands()->addCommand("multiplayer-connect", do_multiplayer_connect);
globals->get_commands()->addCommand("multiplayer-disconnect", do_multiplayer_disconnect);
globals->get_commands()->addCommand("multiplayer-refreshserverlist", do_multiplayer_refreshserverlist);
} // FGMultiplayMgr::FGMultiplayMgr()
//////////////////////////////////////////////////////////////////////
@ -468,7 +487,9 @@ FGMultiplayMgr::FGMultiplayMgr()
//////////////////////////////////////////////////////////////////////
FGMultiplayMgr::~FGMultiplayMgr()
{
globals->get_commands()->removeCommand("multiplayer");
globals->get_commands()->removeCommand("multiplayer-connect");
globals->get_commands()->removeCommand("multiplayer-disconnect");
globals->get_commands()->removeCommand("multiplayer-refreshserverlist");
} // FGMultiplayMgr::~FGMultiplayMgr()
//////////////////////////////////////////////////////////////////////