Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Fix Windows build. Those includes in 1a3fb29ff3 didn't resolve properly on Windows, refs #3953.

Browse Source 
This was SVN commit r18143.
This commit is contained in:
elexis 2016-05-08 16:25:00 +00:00
parent cf7a71965b
commit 883d1aaf48
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/network/NetServer.cpp
View File

@ -25,6 +25,7 @@
#include "NetStats.h"
#include "NetTurnManager.h"
#include "lib/external_libraries/enet.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"
#include "scriptinterface/ScriptInterface.h"
@ -795,7 +796,7 @@ bool CNetServerWorker::KickPlayer(const CStrW& playerName, const bool ban)
m_BannedPlayers.push_back(playerName);
// Remember IP address
enet_uint32 ipAddress = (*it)->GetIPAddress();
u32 ipAddress = (*it)->GetIPAddress();
if (std::find(m_BannedIPs.begin(), m_BannedIPs.end(), ipAddress) == m_BannedIPs.end())
m_BannedIPs.push_back(ipAddress);
}

3
source/network/NetServer.h
View File

@ -22,7 +22,6 @@
#include "NetHost.h"
#include "lib/config2.h"
#include "lib/external_libraries/enet.h"
#include "ps/ThreadUtil.h"
#include "scriptinterface/ScriptVal.h"
@ -314,7 +313,7 @@ private:
CStrW m_ServerName;
CStrW m_WelcomeMessage;
std::vector<enet_uint32> m_BannedIPs;
std::vector<u32> m_BannedIPs;
std::vector<CStrW> m_BannedPlayers;
u32 m_NextHostID;

3
source/network/NetSession.cpp
View File

@ -21,6 +21,7 @@
#include "NetServer.h"
#include "NetMessage.h"
#include "NetStats.h"
#include "lib/external_libraries/enet.h"
#include "ps/CLogger.h"
#include "scriptinterface/ScriptInterface.h"
@ -200,7 +201,7 @@ CNetServerSession::CNetServerSession(CNetServerWorker& server, ENetPeer* peer) :
{
}
enet_uint32 CNetServerSession::GetIPAddress() const
u32 CNetServerSession::GetIPAddress() const
{
return m_Peer->address.host;
}

3
source/network/NetSession.h
View File

@ -21,7 +21,6 @@
#include "network/fsm.h"
#include "network/NetFileTransfer.h"
#include "network/NetHost.h"
#include "lib/external_libraries/enet.h"
#include "ps/CStr.h"
#include "scriptinterface/ScriptVal.h"
@ -143,7 +142,7 @@ public:
u32 GetHostID() const { return m_HostID; }
void SetHostID(u32 id) { m_HostID = id; }
enet_uint32 GetIPAddress() const;
u32 GetIPAddress() const;
/**
* Whether this client is running in the same process as the server.