diff options
| author | oy <Tom_Adams@web.de> | 2011-07-07 01:48:00 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-07-07 01:48:00 +0200 |
| commit | e37d536fdfd69bbd04b869e381d64840a185b854 (patch) | |
| tree | 4abd4195082c25ab52b1b63f3fa4c615d99c80b6 /src/engine | |
| parent | 83d8422c4cf3ad2b04b75c7478c92f91c1f8a307 (diff) | |
| download | zcatch-e37d536fdfd69bbd04b869e381d64840a185b854.tar.gz zcatch-e37d536fdfd69bbd04b869e381d64840a185b854.zip | |
fixed some NETTYPE usage based on the socket state
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/client/client.cpp | 8 | ||||
| -rw-r--r-- | src/engine/client/client.h | 1 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 2 | ||||
| -rw-r--r-- | src/engine/shared/network.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 90cb2011..6949c308 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -693,12 +693,12 @@ void CClient::Connect(const char *pAddress) ServerInfoRequest(); - if(net_host_lookup(m_aServerAddressStr, &m_ServerAddress, NETTYPE_ALL) != 0) + if(net_host_lookup(m_aServerAddressStr, &m_ServerAddress, m_NetClient.NetType()) != 0) { char aBufMsg[256]; str_format(aBufMsg, sizeof(aBufMsg), "could not find the address of %s, connecting to localhost", aBuf); m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBufMsg); - net_host_lookup("localhost", &m_ServerAddress, NETTYPE_ALL); + net_host_lookup("localhost", &m_ServerAddress, m_NetClient.NetType()); } m_RconAuthed = 0; @@ -1799,7 +1799,7 @@ void CClient::VersionUpdate() { if(m_VersionInfo.m_State == CVersionInfo::STATE_INIT) { - Engine()->HostLookup(&m_VersionInfo.m_VersionServeraddr, g_Config.m_ClVersionServer, m_BindAddr.type); + Engine()->HostLookup(&m_VersionInfo.m_VersionServeraddr, g_Config.m_ClVersionServer, m_NetClient.NetType()); m_VersionInfo.m_State = CVersionInfo::STATE_START; } else if(m_VersionInfo.m_State == CVersionInfo::STATE_START) @@ -1881,7 +1881,7 @@ void CClient::Run() Input()->Init(); // start refreshing addresses while we load - MasterServer()->RefreshAddresses(m_BindAddr.type); + MasterServer()->RefreshAddresses(m_NetClient.NetType()); // init the editor m_pEditor->Init(); diff --git a/src/engine/client/client.h b/src/engine/client/client.h index ddcd1167..fa0ddaf7 100644 --- a/src/engine/client/client.h +++ b/src/engine/client/client.h @@ -118,7 +118,6 @@ class CClient : public IClient, public CDemoPlayer::IListner float m_FrameTimeHigh; int m_Frames; NETADDR m_ServerAddress; - NETADDR m_BindAddr; int m_WindowMustRefocus; int m_SnapCrcErrors; bool m_AutoScreenshotRecycle; diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 14467b2b..a707b690 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1246,7 +1246,7 @@ int CServer::Run() } // master server stuff - m_Register.RegisterUpdate(BindAddr.type); + m_Register.RegisterUpdate(m_NetServer.NetType()); PumpNetwork(); diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h index 425d970a..228ba6dd 100644 --- a/src/engine/shared/network.h +++ b/src/engine/shared/network.h @@ -285,6 +285,7 @@ public: // status requests NETADDR ClientAddr(int ClientID) const { return m_aSlots[ClientID].m_Connection.PeerAddress(); } NETSOCKET Socket() const { return m_Socket; } + int NetType() { return m_Socket.type; } int MaxClients() const { return m_MaxClients; } // @@ -320,6 +321,7 @@ public: int ResetErrorString(); // error and state + int NetType() { return m_Socket.type; } int State(); int GotProblems(); const char *ErrorString(); |