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

Ref T730, use getFsdCallsignString() in FSD client where applicable

Browse Source
This commit is contained in:
Klaus Basan
2019-09-28 00:51:12 +02:00
committed by Mat Sutcliffe
parent dcfe275cc1
commit 0853cc174c
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackcore/fsd/fsdclient.cpp
View File

@@ -266,7 +266,7 @@ namespace BlackCore
void CFSDClient::sendDeletePilot() void CFSDClient::sendDeletePilot()
{ {
const QString cid = m_server.getUser().getId(); const QString cid = m_server.getUser().getId();
DeletePilot deletePilot(m_ownCallsign.asString(), cid); DeletePilot deletePilot(m_ownCallsign.getFsdCallsignString(), cid);
sendMessage(deletePilot); sendMessage(deletePilot);
} }
@@ -389,38 +389,37 @@ namespace BlackCore
void CFSDClient::sendClientQuery(ClientQueryType queryType, const CCallsign &receiver, const QStringList &queryData) void CFSDClient::sendClientQuery(ClientQueryType queryType, const CCallsign &receiver, const QStringList &queryData)
{ {
if (queryType == ClientQueryType::Unknown) if (queryType == ClientQueryType::Unknown) { return; }
{
return; const QString reveiverCallsign = receiver.getFsdCallsignString();
} if (queryType == ClientQueryType::IsValidATC)
else if (queryType == ClientQueryType::IsValidATC)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), "SERVER", ClientQueryType::IsValidATC, queryData); ClientQuery clientQuery(m_ownCallsign.asString(), "SERVER", ClientQueryType::IsValidATC, queryData);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
else if (queryType == ClientQueryType::Capabilities) else if (queryType == ClientQueryType::Capabilities)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::Capabilities); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::Capabilities);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
else if (queryType == ClientQueryType::Com1Freq) else if (queryType == ClientQueryType::Com1Freq)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::Com1Freq); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::Com1Freq);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
else if (queryType == ClientQueryType::RealName) else if (queryType == ClientQueryType::RealName)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::RealName); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::RealName);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
else if (queryType == ClientQueryType::Server) else if (queryType == ClientQueryType::Server)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::Server); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::Server);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
else if (queryType == ClientQueryType::ATIS) else if (queryType == ClientQueryType::ATIS)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::ATIS); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::ATIS);
sendMessage(clientQuery); sendMessage(clientQuery);
if (m_serverType != ServerType::Vatsim) if (m_serverType != ServerType::Vatsim)
{ {
@@ -429,12 +428,12 @@ namespace BlackCore
} }
else if (queryType == ClientQueryType::PublicIP) else if (queryType == ClientQueryType::PublicIP)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::PublicIP); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::PublicIP);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
else if (queryType == ClientQueryType::INF) else if (queryType == ClientQueryType::INF)
{ {
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::INF); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::INF);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
else if (queryType == ClientQueryType::FP) else if (queryType == ClientQueryType::FP)
@@ -446,7 +445,7 @@ namespace BlackCore
if (queryType == ClientQueryType::AircraftConfig) if (queryType == ClientQueryType::AircraftConfig)
{ {
if (queryData.size() == 0) { return; } if (queryData.size() == 0) { return; }
ClientQuery clientQuery(m_ownCallsign.asString(), receiver.toQString(), ClientQueryType::AircraftConfig, queryData); ClientQuery clientQuery(m_ownCallsign.asString(), reveiverCallsign, ClientQueryType::AircraftConfig, queryData);
sendMessage(clientQuery); sendMessage(clientQuery);
} }
@@ -462,7 +461,7 @@ namespace BlackCore
for (const auto &message : as_const(privateMessages)) for (const auto &message : as_const(privateMessages))
{ {
if (message.getRecipientCallsign().isEmpty()) { continue; } if (message.getRecipientCallsign().isEmpty()) { continue; }
TextMessage textMessage(m_ownCallsign.asString(), message.getRecipientCallsign().toQString(), message.getMessage()); TextMessage textMessage(m_ownCallsign.asString(), message.getRecipientCallsign().getFsdCallsignString(), message.getMessage());
sendMessage(textMessage); sendMessage(textMessage);
emit this->textMessageSent(message); emit this->textMessageSent(message);