flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add new command line argument 'serverType'

Browse Source 
ServerType allows to override the ServerType at runtime

refs #872
This commit is contained in:
Roland Winklmeier
2017-01-28 00:41:04 +01:00
committed by Mathew Sutcliffe
parent c260af7b11
commit 1401b2f956
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -117,7 +117,10 @@ namespace BlackCore
clientKey = CBuildConfig::vatsimPrivateKey();
}
VatServerType serverType = CBuildConfig::isVatsimVersion() ? vatServerVatsim : vatServerLegacyFsd;
VatServerType serverType;
bool success = getCmdLineServerType(serverType);
if(!success) { serverType = CBuildConfig::isVatsimVersion() ? vatServerVatsim : vatServerLegacyFsd; }
m_net.reset(Vat_CreateNetworkSession(serverType, sApp->swiftVersionChar(),
CVersion::versionMajor(), CVersion::versionMinor(),
"None", clientId, clientKey.toLocal8Bit().constData(),
@@ -683,8 +686,11 @@ namespace BlackCore
static const QList<QCommandLineOption> opts
{
QCommandLineOption({ "idAndKey", "clientIdAndKey" },
QCoreApplication::translate("application", "Client id and key pair separated by ':', e.g. <id>:<key>."),
"clientIdAndKey")
QCoreApplication::translate("networkvatlib", "Client id and key pair separated by ':', e.g. <id>:<key>."),
"clientIdAndKey"),
QCommandLineOption({ "s", "serverType" },
QCoreApplication::translate("networkvatlib", "FSD server type. Possible values: vatsim, fsd"),
"serverType")
};
// only in not officially shipped versions
@@ -704,6 +710,23 @@ namespace BlackCore
return true;
}
bool CNetworkVatlib::getCmdLineServerType(VatServerType &serverType) const
{
QString serverTypeAsString = sApp->getParserValue("serverType").toLower();
if(QString::compare(serverTypeAsString, "vatsim", Qt::CaseInsensitive) == 0)
{
serverType = vatServerVatsim;
return true;
}
if(QString::compare(serverTypeAsString, "fsd", Qt::CaseInsensitive) == 0)
{
serverType = vatServerLegacyFsd;
return true;
}
return false;
}
void CNetworkVatlib::sendCustomFsinnQuery(const BlackMisc::Aviation::CCallsign &callsign)
{
Q_ASSERT_X(isConnected(), Q_FUNC_INFO, "Can't send to server when disconnected");

3
src/blackcore/vatsim/networkvatlib.h
View File

@@ -121,8 +121,9 @@ namespace BlackCore
//! Cmd. line options this library can handle
static const QList<QCommandLineOption> &getCmdLineOptions();
//! Client id and key if any from command line arguments
private:
bool getCmdLineClientIdAndKey(int &id, QString &key) const;
bool getCmdLineServerType(VatServerType &serverType) const;
private slots:
void replyToFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign);