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

Ref T180, remove aircraft

Browse Source 
* utility function getAllCallsigns
* allow to trace sendId (in removing)
* make sure aircraft are not added again by upfront clearing lists
This commit is contained in:
Klaus Basan
2017-11-06 18:10:19 +01:00
parent fd62ef80e0
commit 40dcd9c167
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/simulator/fsxcommon/simconnectobject.cpp
View File

@@ -7,6 +7,7 @@
* contained in the LICENSE file.
*/
#include "simconnectobject.h"
#include "simconnectobject.h"
#include "blackmisc/simulation/interpolatormulti.h"
@@ -128,6 +129,11 @@ namespace BlackSimPlugin
return getSimObjectForObjectId(objectId).getCallsign();
}
CCallsignSet CSimConnectObjects::getAllCallsigns() const
{
return CCallsignSet(this->keys());
}
CSimConnectObject CSimConnectObjects::getSimObjectForObjectId(DWORD objectId) const
{
for (const CSimConnectObject &simObject : this->values())

3
src/plugins/simulator/fsxcommon/simconnectobject.h
View File

@@ -186,6 +186,9 @@ namespace BlackSimPlugin
//! Number of pending removed
int countPendingRemoved() const;
//! Get all callsigns
BlackMisc::Aviation::CCallsignSet getAllCallsigns() const;
//! Callsigns of pending added callsigns
BlackMisc::Aviation::CCallsignSet getPendingAddedCallsigns() const;

19
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -915,7 +915,11 @@ namespace BlackSimPlugin
// call in SIM
const SIMCONNECT_DATA_REQUEST_ID requestId = this->obtainRequestIdForSimData();
const HRESULT result = SimConnect_AIRemoveObject(m_hSimConnect, static_cast<SIMCONNECT_OBJECT_ID>(simObject.getObjectId()), requestId);
if (result != S_OK)
if (result == S_OK)
{
if (m_traceSendId) { this->traceSendId(simObject.getObjectId(), Q_FUNC_INFO);}
}
else
{
CLogMessage(this).warning("Removing aircraft '%1' from simulator failed") << callsign.asString();
}
@@ -938,14 +942,19 @@ namespace BlackSimPlugin
int CSimulatorFsxCommon::physicallyRemoveAllRemoteAircraft()
{
if (m_simConnectObjects.isEmpty()) { return 0; }
const QList<CCallsign> callsigns(m_simConnectObjects.keys());
// make sure they are not added again
// cleaning here is somewhat redundant, but double checks
m_addPendingAircraft.clear();
m_addAgainAircraftWhenRemoved.clear();
// remove one by one
int r = 0;
const CCallsignSet callsigns = m_simConnectObjects.getAllCallsigns();
for (const CCallsign &cs : callsigns)
{
if (physicallyRemoveRemoteAircraft(cs)) { r++; }
if (this->physicallyRemoveRemoteAircraft(cs)) { r++; }
}
clearAllAircraft();
this->clearAllAircraft();
return r;
}