flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

FS9 style

Browse Source
This commit is contained in:
Klaus Basan
2019-08-17 15:29:05 +02:00
committed by Mat Sutcliffe
parent dd70a67cf0
commit 51ce3778b6
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/simulator/fs9/directplaypeer.h
View File

@@ -38,7 +38,7 @@ namespace BlackSimPlugin
CDirectPlayPeer(QObject *parent, const BlackMisc::Aviation::CCallsign &callsign);
//! Destructor
virtual ~CDirectPlayPeer();
virtual ~CDirectPlayPeer() override;
//! Returns users DirectPlay ID
DPNID getPlayerUserId() const { return m_playerUser; }
@@ -78,8 +78,8 @@ namespace BlackSimPlugin
const BlackMisc::Aviation::CCallsign m_callsign; //!< Peer callsign
IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address
IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address
IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address
IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address
QList<CHostNode> m_hostNodeList; //!< List of enumerated hosts
quint32 m_packetIndex = 0; //!< Multiplayer packet index

40
src/plugins/simulator/fs9/fs9host.cpp
View File

@@ -45,11 +45,11 @@ namespace BlackSimPlugin
DWORD dwNumAddresses = 0;
HRESULT hr;
QVector<LPDIRECTPLAY8ADDRESS> addresses(dwNumAddresses);
QVector<LPDIRECTPLAY8ADDRESS> addresses(static_cast<int>(dwNumAddresses));
m_directPlayPeer->GetLocalHostAddresses(addresses.data(), &dwNumAddresses, 0);
addresses.resize(dwNumAddresses);
ZeroMemory( addresses.data(), dwNumAddresses * sizeof(LPDIRECTPLAY8ADDRESS) );
if (FAILED (hr = m_directPlayPeer->GetLocalHostAddresses(addresses.data(), &dwNumAddresses, 0)))
addresses.resize(static_cast<int>(dwNumAddresses));
ZeroMemory(addresses.data(), dwNumAddresses * sizeof(LPDIRECTPLAY8ADDRESS));
if (FAILED(hr = m_directPlayPeer->GetLocalHostAddresses(addresses.data(), &dwNumAddresses, 0)))
{
logDirectPlayError(hr);
return address;
@@ -62,7 +62,7 @@ namespace BlackSimPlugin
for (uint ii = 0; ii < dwNumAddresses; ++ii)
{
LPDIRECTPLAY8ADDRESS pAddress = addresses[ii];
LPDIRECTPLAY8ADDRESS pAddress = addresses[static_cast<int>(ii)];
SafeRelease(pAddress);
}
}
@@ -90,8 +90,8 @@ namespace BlackSimPlugin
DPN_APPLICATION_DESC dpAppDesc;
QScopedArrayPointer<wchar_t> wszSession(new wchar_t[session.size() + 1]);
QScopedArrayPointer<wchar_t> wszPlayername(new wchar_t[callsign.size() + 1]);
QScopedArrayPointer<wchar_t> wszSession(new wchar_t[static_cast<unsigned>(session.size()) + 1]);
QScopedArrayPointer<wchar_t> wszPlayername(new wchar_t[static_cast<unsigned>(callsign.size()) + 1]);
session.toWCharArray(wszSession.data());
wszSession[session.size()] = 0;
@@ -125,12 +125,12 @@ namespace BlackSimPlugin
dpAppDesc.pwszSessionName = wszSession.data();
// We are now ready to host the app
if (FAILED(hr = m_directPlayPeer->Host(&dpAppDesc, // AppDesc
&m_deviceAddress, 1, // Device Address
if (FAILED(hr = m_directPlayPeer->Host(&dpAppDesc, // AppDesc
&m_deviceAddress, 1, // Device Address
nullptr,
nullptr, // Reserved
nullptr, // Player Context
0))) // dwFlags
nullptr, // Reserved
nullptr, // Player Context
0))) // dwFlags
{
logDirectPlayError(hr);
return hr;
@@ -143,17 +143,17 @@ namespace BlackSimPlugin
// Enumerate the number of stalled DirectPlay peers
DWORD dwNumPlayers = 0;
hr = m_directPlayPeer->EnumPlayersAndGroups( nullptr, &dwNumPlayers, DPNENUM_PLAYERS );
hr = m_directPlayPeer->EnumPlayersAndGroups(nullptr, &dwNumPlayers, DPNENUM_PLAYERS);
if(hr == DPNERR_BUFFERTOOSMALL)
if (hr == DPNERR_BUFFERTOOSMALL)
{
QScopedArrayPointer<DPNID> stalledPeers(new DPNID[dwNumPlayers]);
hr = m_directPlayPeer->EnumPlayersAndGroups( stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS );
hr = m_directPlayPeer->EnumPlayersAndGroups(stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS);
// Destroy all stalled peers
for (DWORD i = 0; i < dwNumPlayers; ++i)
{
m_directPlayPeer->DestroyPeer(stalledPeers[i], nullptr, 0, 0);
m_directPlayPeer->DestroyPeer(stalledPeers[static_cast<int>(i)], nullptr, 0, 0);
}
}
@@ -182,17 +182,17 @@ namespace BlackSimPlugin
// Enumerate the number of stalled DirectPlay peers
DWORD dwNumPlayers = 0;
hr = m_directPlayPeer->EnumPlayersAndGroups( nullptr, &dwNumPlayers, DPNENUM_PLAYERS );
hr = m_directPlayPeer->EnumPlayersAndGroups(nullptr, &dwNumPlayers, DPNENUM_PLAYERS);
if(hr == DPNERR_BUFFERTOOSMALL)
if (hr == DPNERR_BUFFERTOOSMALL)
{
QScopedArrayPointer<DPNID> stalledPeers(new DPNID[dwNumPlayers]);
hr = m_directPlayPeer->EnumPlayersAndGroups( stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS );
hr = m_directPlayPeer->EnumPlayersAndGroups(stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS);
// Destroy all stalled peers
for (DWORD i = 0; i < dwNumPlayers; ++i)
{
m_directPlayPeer->DestroyPeer(stalledPeers[i], nullptr, 0, 0);
m_directPlayPeer->DestroyPeer(stalledPeers[static_cast<int>(i)], nullptr, 0, 0);
}
}

8
src/plugins/simulator/fs9/fs9host.h
View File

@@ -34,7 +34,7 @@ namespace BlackSimPlugin
CFs9Host(QObject *owner);
//! Destructor
virtual ~CFs9Host();
virtual ~CFs9Host() override;
//! Returns true if the users simulator is connected
bool isConnected() const { return m_playerUser != 0; }
@@ -59,9 +59,9 @@ namespace BlackSimPlugin
HostStatus m_hostStatus = Terminated;
};
}
}
} // ns
} // ns
Q_DECLARE_METATYPE(BlackSimPlugin::Fs9::CFs9Host::HostStatus)
#endif // DIRECTPLAY_HOST_H
#endif // guard