diff options
| author | oy <Tom_Adams@web.de> | 2010-08-16 02:21:18 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-08-16 02:21:18 +0200 |
| commit | abc84ac0b0ff77b3b30a20252f86332c699e4466 (patch) | |
| tree | 4ed487066f87aaac06b28ffd749f94126b169cd9 /src/engine/shared | |
| parent | 4c2dcc4f2b5f061a1d75aa2aa0b316c4b86bc1d8 (diff) | |
| download | zcatch-abc84ac0b0ff77b3b30a20252f86332c699e4466.tar.gz zcatch-abc84ac0b0ff77b3b30a20252f86332c699e4466.zip | |
added fixes for compiler errors and warnings by sworddragon
Diffstat (limited to 'src/engine/shared')
| -rw-r--r-- | src/engine/shared/datafile.cpp | 2 | ||||
| -rw-r--r-- | src/engine/shared/huffman.cpp | 4 | ||||
| -rw-r--r-- | src/engine/shared/huffman.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/shared/datafile.cpp b/src/engine/shared/datafile.cpp index e7905f81..69b187ea 100644 --- a/src/engine/shared/datafile.cpp +++ b/src/engine/shared/datafile.cpp @@ -383,7 +383,7 @@ bool CDataFileReader::Close() unsigned CDataFileReader::Crc() { - if(!m_pDataFile) return -1; + if(!m_pDataFile) return 0xFFFFFFFF; return m_pDataFile->m_Crc; } diff --git a/src/engine/shared/huffman.cpp b/src/engine/shared/huffman.cpp index 8b0c1cd0..bb7aeaa8 100644 --- a/src/engine/shared/huffman.cpp +++ b/src/engine/shared/huffman.cpp @@ -7,7 +7,7 @@ struct CHuffmanConstructNode int m_Frequency; }; -void CHuffman::Setbits_r(CNode *pNode, int Bits, int Depth) +void CHuffman::Setbits_r(CNode *pNode, int Bits, unsigned Depth) { if(pNode->m_aLeafs[1] != 0xffff) Setbits_r(&m_aNodes[pNode->m_aLeafs[1]], Bits|(1<<Depth), Depth+1); @@ -52,7 +52,7 @@ void CHuffman::ConstructTree(const unsigned *pFrequencies) // add the symbols for(int i = 0; i < HUFFMAN_MAX_SYMBOLS; i++) { - m_aNodes[i].m_NumBits = -1; + 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; diff --git a/src/engine/shared/huffman.h b/src/engine/shared/huffman.h index 5aa56c8f..abf6e0e4 100644 --- a/src/engine/shared/huffman.h +++ b/src/engine/shared/huffman.h @@ -35,7 +35,7 @@ class CHuffman CNode *m_pStartNode; int m_NumNodes; - void Setbits_r(CNode *pNode, int Bits, int Depth); + void Setbits_r(CNode *pNode, int Bits, unsigned Depth); void ConstructTree(const unsigned *pFrequencies); public: |