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

Ref T172, disabled x-dependency between type and eco system

Browse Source 
This makes it impossible to set some combinations
This commit is contained in:
Klaus Basan
2018-01-17 05:02:09 +01:00
parent c42b325d54
commit 42e5b06926
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/network/server.cpp
View File

@@ -99,7 +99,6 @@ namespace BlackMisc
// cross dependency // cross dependency
if (ecosystem.isSystem(CEcosystem::VATSIM)) { m_serverType = FSDServerVatsim; } if (ecosystem.isSystem(CEcosystem::VATSIM)) { m_serverType = FSDServerVatsim; }
if (ecosystem.isSystem(CEcosystem::PrivateFSD)) { m_serverType = FSDServer; }
if (ecosystem.isSystem(CEcosystem::SwiftTest)) { m_serverType = FSDServerVatsim; } if (ecosystem.isSystem(CEcosystem::SwiftTest)) { m_serverType = FSDServerVatsim; }
return true; return true;
} }
@@ -123,17 +122,8 @@ namespace BlackMisc
bool CServer::setServerType(CServer::ServerType serverType) bool CServer::setServerType(CServer::ServerType serverType)
{ {
if (m_serverType == serverType) { return false; } // avoid x-dependency if (m_serverType == serverType) { return false; } // avoid x-dependency
// disabled x-dependency
m_serverType = static_cast<int>(serverType); m_serverType = static_cast<int>(serverType);
switch (m_serverType)
{
case FSDServerVatsim : m_ecosystem = CEcosystem(CEcosystem::VATSIM); break;
case FSDServer: m_ecosystem = CEcosystem(CEcosystem::PrivateFSD); break;
case VoiceServerVatsim: m_ecosystem = CEcosystem(CEcosystem::VATSIM); break;
case VoiceServer: m_ecosystem = CEcosystem(CEcosystem::PrivateFSD); break;
case WebService: m_ecosystem = CEcosystem(CEcosystem::NoSystem); break;
case Unspecified: m_ecosystem = CEcosystem(CEcosystem::Unspecified); break;
default: break;
}
return true; return true;
} }