sometimes my git just wants to commit a file no matter how many times i revert it

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-24 23:38:40 +02:00
parent 92b51c3ec8
commit 7ff7ca85ec

View file

@ -1,50 +1,50 @@
#ifndef ENGINE_SERVER_REGISTER_H #ifndef ENGINE_SERVER_REGISTER_H
#define ENGINE_SERVER_REGISTER_H #define ENGINE_SERVER_REGISTER_H
#include <engine/masterserver.h> #include <engine/masterserver.h>
class CRegister class CRegister
{ {
enum enum
{ {
REGISTERSTATE_START=0, REGISTERSTATE_START=0,
REGISTERSTATE_UPDATE_ADDRS, REGISTERSTATE_UPDATE_ADDRS,
REGISTERSTATE_QUERY_COUNT, REGISTERSTATE_QUERY_COUNT,
REGISTERSTATE_HEARTBEAT, REGISTERSTATE_HEARTBEAT,
REGISTERSTATE_REGISTERED, REGISTERSTATE_REGISTERED,
REGISTERSTATE_ERROR REGISTERSTATE_ERROR
}; };
struct CMasterserverInfo struct CMasterserverInfo
{ {
NETADDR m_Addr; NETADDR m_Addr;
int m_Count; int m_Count;
int m_Valid; int m_Valid;
int64 m_LastSend; int64 m_LastSend;
}; };
class CNetServer *m_pNetServer; class CNetServer *m_pNetServer;
class IEngineMasterServer *m_pMasterServer; class IEngineMasterServer *m_pMasterServer;
int m_RegisterState; int m_RegisterState;
int64 m_RegisterStateStart; int64 m_RegisterStateStart;
int m_RegisterFirst; int m_RegisterFirst;
int m_RegisterCount; int m_RegisterCount;
class CMasterserverInfo m_aMasterserverInfo[IMasterServer::MAX_MASTERSERVERS]; class CMasterserverInfo m_aMasterserverInfo[IMasterServer::MAX_MASTERSERVERS];
int m_RegisterRegisteredServer; int m_RegisterRegisteredServer;
void RegisterNewState(int State); void RegisterNewState(int State);
void RegisterSendFwcheckresponse(NETADDR *pAddr); void RegisterSendFwcheckresponse(NETADDR *pAddr);
void RegisterSendHeartbeat(NETADDR Addr); void RegisterSendHeartbeat(NETADDR Addr);
void RegisterSendCountRequest(NETADDR Addr); void RegisterSendCountRequest(NETADDR Addr);
void RegisterGotCount(class CNetChunk *pChunk); void RegisterGotCount(class CNetChunk *pChunk);
public: public:
CRegister(); CRegister();
void Init(class CNetServer *pNetServer, class IEngineMasterServer *pMasterServer); void Init(class CNetServer *pNetServer, class IEngineMasterServer *pMasterServer);
void RegisterUpdate(); void RegisterUpdate();
int RegisterProcessPacket(class CNetChunk *pPacket); int RegisterProcessPacket(class CNetChunk *pPacket);
}; };
#endif #endif