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

Formatting, minor tweaks

Browse Source
This commit is contained in:
Klaus Basan
2018-04-27 02:32:41 +02:00
committed by Roland Winklmeier
parent a8ab2a37b8
commit 1f3e5c6abf
11 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,9 +121,12 @@ namespace BlackSimPlugin
//! Set Simconnect object id
void setObjectId(DWORD id);
//! Set Simconnect object id
//! Get Simconnect object id
DWORD getObjectId() const { return m_objectId; }
//! Get Simconnect object id
QString getObjectIdAsString() const { return QString::number(this->getObjectId()); }
//! Valid request id?
bool hasValidRequestId() const { return m_validRequestId; }

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

@@ -723,8 +723,10 @@ namespace BlackSimPlugin
if (!toBeAddedAircraft.isEmpty())
{
const CSimulatedAircraft nextPendingAircraft(m_addPendingAircraft.front());
const QPointer <CSimulatorFsxCommon> myself(this);
QTimer::singleShot(100, this, [ = ]
{
if (myself.isNull()) { return; }
this->physicallyAddRemoteAircraftImpl(nextPendingAircraft, mode);
});
}
@@ -742,7 +744,7 @@ namespace BlackSimPlugin
const CSimConnectObject simObject = m_simConnectObjects.getSimObjectForObjectId(objectID);
if (!simObject.hasValidRequestAndObjectId()) { return false; } // object id from somewhere else
const CCallsign callsign(simObject.getCallsign());
Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "missing callsign");
Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Missing callsign for removed object");
if (simObject.isPendingRemoved())
{

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -97,7 +97,7 @@ namespace BlackSimPlugin
};
//! FSX Simulator Implementation
class CSimulatorFsxCommon : public BlackSimPlugin::FsCommon::CSimulatorFsCommon
class CSimulatorFsxCommon : public FsCommon::CSimulatorFsCommon
{
Q_OBJECT
Q_INTERFACES(BlackCore::ISimulator)