From 7ff7ca85ecdc1b0036ba1ef1de41a6b66fc10699 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Tue, 24 Aug 2010 23:38:40 +0200 Subject: [PATCH] sometimes my git just wants to commit a file no matter how many times i revert it Signed-off-by: GreYFoXGTi --- src/engine/server/register.h | 98 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/src/engine/server/register.h b/src/engine/server/register.h index 185ac84c4..0491ac270 100644 --- a/src/engine/server/register.h +++ b/src/engine/server/register.h @@ -1,50 +1,50 @@ -#ifndef ENGINE_SERVER_REGISTER_H -#define ENGINE_SERVER_REGISTER_H - -#include - -class CRegister -{ - enum - { - REGISTERSTATE_START=0, - REGISTERSTATE_UPDATE_ADDRS, - REGISTERSTATE_QUERY_COUNT, - REGISTERSTATE_HEARTBEAT, - REGISTERSTATE_REGISTERED, - REGISTERSTATE_ERROR - }; - - struct CMasterserverInfo - { - NETADDR m_Addr; - int m_Count; - int m_Valid; - int64 m_LastSend; - }; - - class CNetServer *m_pNetServer; - class IEngineMasterServer *m_pMasterServer; - - int m_RegisterState; - int64 m_RegisterStateStart; - int m_RegisterFirst; - int m_RegisterCount; - - class CMasterserverInfo m_aMasterserverInfo[IMasterServer::MAX_MASTERSERVERS]; - int m_RegisterRegisteredServer; - - void RegisterNewState(int State); - void RegisterSendFwcheckresponse(NETADDR *pAddr); - void RegisterSendHeartbeat(NETADDR Addr); - void RegisterSendCountRequest(NETADDR Addr); - void RegisterGotCount(class CNetChunk *pChunk); - -public: - CRegister(); - void Init(class CNetServer *pNetServer, class IEngineMasterServer *pMasterServer); - void RegisterUpdate(); - int RegisterProcessPacket(class CNetChunk *pPacket); -}; - +#ifndef ENGINE_SERVER_REGISTER_H +#define ENGINE_SERVER_REGISTER_H + +#include + +class CRegister +{ + enum + { + REGISTERSTATE_START=0, + REGISTERSTATE_UPDATE_ADDRS, + REGISTERSTATE_QUERY_COUNT, + REGISTERSTATE_HEARTBEAT, + REGISTERSTATE_REGISTERED, + REGISTERSTATE_ERROR + }; + + struct CMasterserverInfo + { + NETADDR m_Addr; + int m_Count; + int m_Valid; + int64 m_LastSend; + }; + + class CNetServer *m_pNetServer; + class IEngineMasterServer *m_pMasterServer; + + int m_RegisterState; + int64 m_RegisterStateStart; + int m_RegisterFirst; + int m_RegisterCount; + + class CMasterserverInfo m_aMasterserverInfo[IMasterServer::MAX_MASTERSERVERS]; + int m_RegisterRegisteredServer; + + void RegisterNewState(int State); + void RegisterSendFwcheckresponse(NETADDR *pAddr); + void RegisterSendHeartbeat(NETADDR Addr); + void RegisterSendCountRequest(NETADDR Addr); + void RegisterGotCount(class CNetChunk *pChunk); + +public: + CRegister(); + void Init(class CNetServer *pNetServer, class IEngineMasterServer *pMasterServer); + void RegisterUpdate(); + int RegisterProcessPacket(class CNetChunk *pPacket); +}; + #endif \ No newline at end of file