From abc84ac0b0ff77b3b30a20252f86332c699e4466 Mon Sep 17 00:00:00 2001
From: oy <Tom_Adams@web.de>
Date: Mon, 16 Aug 2010 02:21:18 +0200
Subject: added fixes for compiler errors and warnings by sworddragon

---
 src/engine/shared/datafile.cpp | 2 +-
 src/engine/shared/huffman.cpp  | 4 ++--
 src/engine/shared/huffman.h    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/engine/shared')

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:
-- 
cgit 1.4.1