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

Ref T345, fixed bug: only one station must be updated with the new message

Browse Source
This commit is contained in:
Klaus Basan
2018-09-17 18:24:42 +02:00
parent 4913b93724
commit a9f0cebe13
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/aviation/atcstationlist.cpp
View File

@@ -40,28 +40,32 @@ namespace BlackMisc
});
}
int CAtcStationList::updateIfMessageChanged(const CInformationMessage &im, bool overrideWithNewer)
bool CAtcStationList::updateIfMessageChanged(const CInformationMessage &im, const CCallsign &callsign, bool overrideWithNewer)
{
int c = 0;
const CInformationMessage::InformationType t = im.getType();
// for loop just to get reference
bool unequal = false;
for (CAtcStation &station : *this)
{
bool unequal = false;
if (station.getCallsign() != callsign) { continue; }
const CInformationMessage m = station.getInformationMessage(t);
if (m.getType() == CInformationMessage::Unspecified) { continue; }
if (m.getType() == CInformationMessage::Unspecified) { break; }
if (m.getMessage() == im.getMessage())
{
if (!overrideWithNewer) { continue; }
if (!im.isNewerThan(m)) { continue; }
if (!overrideWithNewer) { break; }
if (!im.isNewerThan(m)) { break; }
}
else
{
unequal = true;
}
station.setMessage(m);
if (unequal) c++; // only count unequals
station.setMessage(im);
break; // only count unequals
}
return c;
return unequal;
}
int CAtcStationList::setOnline(const CCallsign &callsign, bool online)

2
src/blackmisc/aviation/atcstationlist.h
View File

@@ -49,7 +49,7 @@ namespace BlackMisc
CAtcStationList findIfComUnitTunedIn25KHz(const CComSystem &comUnit) const;
//! Update if message changed
int updateIfMessageChanged(const CInformationMessage &im, bool overrideWithNewer);
bool updateIfMessageChanged(const CInformationMessage &im, const CCallsign &callsign, bool overrideWithNewer);
//! Set online status
int setOnline(const CCallsign &callsign, bool online);