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

refs #445, adjusted the drivers to reflect changes (liveries)

Browse Source
This commit is contained in:
Klaus Basan
2015-07-10 01:27:23 +02:00
committed by Mathew Sutcliffe
parent 3e982b014f
commit 13df4302d7
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/fs9/fs9_host.cpp
View File

@@ -25,7 +25,7 @@ namespace BlackSimPlugin
namespace Fs9 namespace Fs9
{ {
CFs9Host::CFs9Host(QObject *owner) : CFs9Host::CFs9Host(QObject *owner) :
CDirectPlayPeer(owner, CProject::systemNameAndVersion()) CDirectPlayPeer(owner, CProject::swiftVersionString())
{ {
} }
@@ -80,7 +80,7 @@ namespace BlackSimPlugin
{ {
initDirectPlay(); initDirectPlay();
createHostAddress(); createHostAddress();
startHosting(CProject::systemNameAndVersion(), m_callsign.toQString()); startHosting(CProject::swiftVersionString(), m_callsign.toQString());
} }
void CFs9Host::cleanup() void CFs9Host::cleanup()

2
src/plugins/simulator/fs9/lobby_client.cpp
View File

@@ -209,7 +209,7 @@ namespace BlackSimPlugin
// Set the device addresses // Set the device addresses
apDevAddress[0] = pDeviceAddress; apDevAddress[0] = pDeviceAddress;
QString session = BlackMisc::CProject::systemNameAndVersion(); QString session = BlackMisc::CProject::swiftVersionString();
QScopedArrayPointer<wchar_t> wstrSessionName(new wchar_t[session.size() + 1]); QScopedArrayPointer<wchar_t> wstrSessionName(new wchar_t[session.size() + 1]);
session.toWCharArray(wstrSessionName.data()); session.toWCharArray(wstrSessionName.data());
wstrSessionName[session.size()] = 0; wstrSessionName[session.size()] = 0;

2
src/plugins/simulator/fs9/simulator_fs9.cpp
View File

@@ -63,7 +63,7 @@ namespace BlackSimPlugin
"Boeing 737-400", "Boeing 737-400",
CAircraftModel::TypeModelMatchingDefaultModel, CAircraftModel::TypeModelMatchingDefaultModel,
"B737-400 default model", "B737-400 default model",
CAircraftIcaoData(CAircraftIcaoCode("B734", "L2J"), CAirlineIcaoCode(), "FFFFFF") CAircraftIcaoData(CAircraftIcaoCode("B734", "L2J"), CAirlineIcaoCode())
)); ));
} }

6
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -57,7 +57,7 @@ namespace BlackSimPlugin
"Boeing 737-800 Paint1", "Boeing 737-800 Paint1",
CAircraftModel::TypeModelMatchingDefaultModel, CAircraftModel::TypeModelMatchingDefaultModel,
"B737-800 default model", "B737-800 default model",
CAircraftIcaoData(CAircraftIcaoCode("B738", "L2J"), CAirlineIcaoCode(), "FFFFFF") CAircraftIcaoData(CAircraftIcaoCode("B738", "L2J"), CAirlineIcaoCode())
)); ));
} }
@@ -80,7 +80,7 @@ namespace BlackSimPlugin
bool CSimulatorFsx::connectTo() bool CSimulatorFsx::connectTo()
{ {
if (this->isConnected()) { return true; } if (this->isConnected()) { return true; }
if (FAILED(SimConnect_Open(&m_hSimConnect, BlackMisc::CProject::systemNameAndVersionChar(), nullptr, 0, 0, 0))) if (FAILED(SimConnect_Open(&m_hSimConnect, BlackMisc::CProject::swiftVersionChar(), nullptr, 0, 0, 0)))
{ {
// reset state as expected for unconnected // reset state as expected for unconnected
if (m_simconnectTimerId >= 0) { killTimer(m_simconnectTimerId); } if (m_simconnectTimerId >= 0) { killTimer(m_simconnectTimerId); }
@@ -869,7 +869,7 @@ namespace BlackSimPlugin
{ {
Q_ASSERT_X(!BlackCore::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Expect to run in background"); Q_ASSERT_X(!BlackCore::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Expect to run in background");
HANDLE hSimConnect; HANDLE hSimConnect;
HRESULT result = SimConnect_Open(&hSimConnect, BlackMisc::CProject::systemNameAndVersionChar(), nullptr, 0, 0, 0); HRESULT result = SimConnect_Open(&hSimConnect, BlackMisc::CProject::swiftVersionChar(), nullptr, 0, 0, 0);
SimConnect_Close(hSimConnect); SimConnect_Close(hSimConnect);
if (result == S_OK) if (result == S_OK)
{ {

2
src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp
View File

@@ -43,7 +43,7 @@ namespace BlackSimPlugin
.arg(event->szApplicationName) .arg(event->szApplicationName)
.arg(event->dwApplicationVersionMajor).arg(event->dwApplicationVersionMinor).arg(event->dwApplicationBuildMajor).arg(event->dwApplicationBuildMinor) .arg(event->dwApplicationVersionMajor).arg(event->dwApplicationVersionMinor).arg(event->dwApplicationBuildMajor).arg(event->dwApplicationBuildMinor)
.arg(event->dwSimConnectVersionMajor).arg(event->dwSimConnectVersionMinor).arg(event->dwSimConnectBuildMajor).arg(event->dwSimConnectBuildMinor); .arg(event->dwSimConnectVersionMajor).arg(event->dwSimConnectVersionMinor).arg(event->dwSimConnectBuildMajor).arg(event->dwSimConnectBuildMinor);
CLogMessage(static_cast<CSimulatorFsx *>(nullptr)).info("Connect to FSX: %1") << CProject::systemNameAndVersion(); CLogMessage(static_cast<CSimulatorFsx *>(nullptr)).info("Connect to FSX: %1") << CProject::swiftVersionString();
break; break;
} }
case SIMCONNECT_RECV_ID_EXCEPTION: case SIMCONNECT_RECV_ID_EXCEPTION: