refs #324 Enable the assert in addAircraftSituation

This commit is contained in:
Roland Winklmeier
2014-10-05 20:05:43 +02:00
parent faf931742a
commit 704721b01a
2 changed files with 3 additions and 13 deletions

View File

@@ -136,14 +136,7 @@ namespace BlackSimPlugin
void CSimulatorFs9::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation) void CSimulatorFs9::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &situation)
{ {
// FIXME: should be a Q_ASSERT Q_ASSERT(m_hashFs9Clients.contains(callsign));
if (!m_hashFs9Clients.contains(callsign))
{
// Only add a maximum number of 20 clients.
// FIXME: We need a smart method to get the 20 nearest aircrafts. If someone logs in
// nearby we need to kick out the one with max distance.
return;
}
CFs9Client *client = m_hashFs9Clients.value(callsign); CFs9Client *client = m_hashFs9Clients.value(callsign);
if (!client) if (!client)

View File

@@ -173,11 +173,8 @@ namespace BlackSimPlugin
void CSimulatorFsx::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &initialSituation) void CSimulatorFsx::addAircraftSituation(const CCallsign &callsign, const CAircraftSituation &initialSituation)
{ {
if (!m_simConnectObjects.contains(callsign)) { Q_ASSERT(m_simConnectObjects.contains(callsign));
// according to #324 this should not happen
Q_ASSERT(false);
this->addRemoteAircraft(callsign, initialSituation);
}
CSimConnectObject simObj = m_simConnectObjects.value(callsign); CSimConnectObject simObj = m_simConnectObjects.value(callsign);
simObj.getInterpolator()->addAircraftSituation(initialSituation); simObj.getInterpolator()->addAircraftSituation(initialSituation);
m_simConnectObjects.insert(callsign, simObj); m_simConnectObjects.insert(callsign, simObj);