diff options
| author | Choupom <andycootlapin@hotmail.fr> | 2011-04-19 16:10:50 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-05-03 19:25:11 +0200 |
| commit | 7f15b3ac5728c44e90a0f0486e17861796f88210 (patch) | |
| tree | 37798531ecec504cb7a242d2e2b0fc38a78a0bbc /src/engine | |
| parent | c2f75b0017f7244b40f109926c48a0484b575ae8 (diff) | |
| download | zcatch-7f15b3ac5728c44e90a0f0486e17861796f88210.tar.gz zcatch-7f15b3ac5728c44e90a0f0486e17861796f88210.zip | |
fixed several stuffs
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/server.h | 1 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 7 | ||||
| -rw-r--r-- | src/engine/server/server.h | 2 | ||||
| -rw-r--r-- | src/engine/shared/huffman.cpp | 4 |
4 files changed, 2 insertions, 12 deletions
diff --git a/src/engine/server.h b/src/engine/server.h index 28dc3d11..28a97ecc 100644 --- a/src/engine/server.h +++ b/src/engine/server.h @@ -31,7 +31,6 @@ public: virtual bool ClientIngame(int ClientID) = 0; virtual int GetClientInfo(int ClientID, CClientInfo *pInfo) = 0; virtual void GetClientAddr(int ClientID, char *pAddrStr, int Size) = 0; - virtual int *LatestInput(int ClientID, int *pSize) = 0; virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) = 0; diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index beac5b9a..0e43e73f 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -345,13 +345,6 @@ void CServer::GetClientAddr(int ClientID, char *pAddrStr, int Size) } -int *CServer::LatestInput(int ClientID, int *size) -{ - if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CServer::CClient::STATE_READY) - return 0; - return m_aClients[ClientID].m_LatestInput.m_aData; -} - const char *CServer::ClientName(int ClientID) { if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY) diff --git a/src/engine/server/server.h b/src/engine/server/server.h index 9a68c9fe..be36a856 100644 --- a/src/engine/server/server.h +++ b/src/engine/server/server.h @@ -148,8 +148,6 @@ public: int ClientCountry(int ClientID); bool ClientIngame(int ClientID); - int *LatestInput(int ClientID, int *size); - virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID); int SendMsgEx(CMsgPacker *pMsg, int Flags, int ClientID, bool System); diff --git a/src/engine/shared/huffman.cpp b/src/engine/shared/huffman.cpp index c88502b5..d08c39c1 100644 --- a/src/engine/shared/huffman.cpp +++ b/src/engine/shared/huffman.cpp @@ -57,8 +57,8 @@ void CHuffman::ConstructTree(const unsigned *pFrequencies) { m_aNodes[i].m_NumBits = 0xFFFFFFFF; m_aNodes[i].m_Symbol = i; - m_aNodes[i].m_aLeafs[0] = -1; - m_aNodes[i].m_aLeafs[1] = -1; + m_aNodes[i].m_aLeafs[0] = 0xffff; + m_aNodes[i].m_aLeafs[1] = 0xffff; if(i == HUFFMAN_EOF_SYMBOL) aNodesLeftStorage[i].m_Frequency = 1; |