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

Ref T761, partner callsign message relay (swift with co-pilot)

Browse Source 
* handle server error messages correctly as "error"
* (relayed) sender can be ATC or aircraft
* relay private messages correctly
This commit is contained in:
Klaus Basan
2019-11-20 23:28:07 +01:00
committed by Mat Sutcliffe
parent 22d8b52fe8
commit f07ca09424
7 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -76,10 +76,10 @@ namespace BlackCore
this); // thread owner
m_fsdClient->start(); // FSD thread
connect(m_fsdClient, &CFSDClient::connectionStatusChanged, this, &CContextNetwork::onFsdConnectionStatusChanged, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::killRequestReceived, this, &CContextNetwork::kicked, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::textMessagesReceived, this, &CContextNetwork::textMessagesReceived, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::textMessageSent, this, &CContextNetwork::textMessageSent, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::severeNetworkError, this, &CContextNetwork::severeNetworkError, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::killRequestReceived, this, &CContextNetwork::kicked, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::textMessagesReceived, this, &CContextNetwork::onTextMessagesReceived, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::textMessageSent, this, &CContextNetwork::onTextMessageSent, Qt::QueuedConnection);
connect(m_fsdClient, &CFSDClient::severeNetworkError, this, &CContextNetwork::severeNetworkError, Qt::QueuedConnection);
// 2. Update timer for data (network data such as frequency)
// we use 2 timers so we can query at different times (not too many queirs at once)
@@ -703,7 +703,7 @@ namespace BlackCore
void CContextNetwork::onTextMessagesReceived(const CTextMessageList &messages)
{
const CTextMessageList textMessages = messages.withRelayedToPrivateMessages();
emit this->textMessagesReceived(textMessages);
emit this->textMessagesReceived(textMessages); // relayed messaged "now look like PMs"
if (textMessages.containsPrivateMessages())
{
@@ -714,10 +714,9 @@ namespace BlackCore
}
// part to send to partner "forward"
if (m_fsdClient && !m_fsdClient->getPresetPartnerCallsign().isEmpty())
const CCallsign partnerCallsign = m_fsdClient ? m_fsdClient->getPresetPartnerCallsign() : CCallsign();
if (!partnerCallsign.isEmpty())
{
const CCallsign partnerCallsign = m_fsdClient->getPresetPartnerCallsign();
// IMPORTANT: use messages AND NOT textMessages here, exclude messages from partner to avoid infinite roundtrips
CTextMessageList relayedMessages;
const CTextMessageList privateMessages = messages.getPrivateMessages().withRemovedPrivateMessagesFromCallsign(partnerCallsign);
@@ -738,6 +737,14 @@ namespace BlackCore
}
}
void CContextNetwork::onTextMessageSent(const CTextMessage &message)
{
if (message.isEmpty()) { return; }
if (message.isRelayedMessage()) { return; }
emit this->textMessageSent(message);
}
const CSimulatedAircraft CContextNetwork::ownAircraft() const
{
Q_ASSERT(this->getRuntime());