commit 201ba4b81853750c9ee262140c795d87b23ae24d
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Oct 18 01:07:28 2006 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Wed Oct 18 01:07:28 2006 +0000
Shut up warnings in w_wad.c.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 706
---
src/d_main.c | 2 +-
src/w_checksum.c | 2 +-
src/w_merge.c | 2 +-
src/w_wad.c | 14 +++++++-------
src/w_wad.h | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 9e5f1f60..b4d77961 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -852,7 +852,7 @@ static void IdentifyVersion(void)
if (gamemission == none)
{
- int i;
+ unsigned int i;
for (i=0; i<numlumps; ++i)
{
diff --git a/src/w_checksum.c b/src/w_checksum.c
index 809e1ee0..339c4eb9 100644
--- a/src/w_checksum.c
+++ b/src/w_checksum.c
@@ -75,7 +75,7 @@ static void ChecksumAddLump(md5_context_t *md5_context, lumpinfo_t *lump)
void W_Checksum(md5_digest_t digest)
{
md5_context_t md5_context;
- int i;
+ unsigned int i;
MD5_Init(&md5_context);
diff --git a/src/w_merge.c b/src/w_merge.c
index 4bb22fdd..1fac471a 100644
--- a/src/w_merge.c
+++ b/src/w_merge.c
@@ -524,7 +524,7 @@ static void DoMerge(void)
void W_PrintDirectory(void)
{
- int i, n;
+ unsigned int i, n;
// debug
for (i=0; i<numlumps; ++i)
diff --git a/src/w_wad.c b/src/w_wad.c
index 21402727..07cd9710 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -47,7 +47,7 @@
// Location of each lump on disk.
lumpinfo_t *lumpinfo;
-int numlumps = 0;
+unsigned int numlumps = 0;
// Hash table for fast lookups
@@ -138,7 +138,7 @@ unsigned int W_LumpNameHash(const char *s)
// specially to allow map reloads.
// But: the reload feature is a fragile hack...
-int reloadlump;
+unsigned int reloadlump;
char* reloadname;
@@ -146,7 +146,7 @@ FILE *W_AddFile (char *filename)
{
wadinfo_t header;
lumpinfo_t* lump_p;
- unsigned i;
+ unsigned int i;
FILE *handle;
int length;
int startlump;
@@ -252,7 +252,7 @@ void W_Reload (void)
wadinfo_t header;
int lumpcount;
lumpinfo_t* lump_p;
- unsigned i;
+ unsigned int i;
FILE *handle;
int length;
filelump_t* fileinfo;
@@ -374,7 +374,7 @@ int W_GetNumForName (char* name)
// W_LumpLength
// Returns the buffer size needed to load the given lump.
//
-int W_LumpLength (int lump)
+int W_LumpLength (unsigned int lump)
{
if (lump >= numlumps)
I_Error ("W_LumpLength: %i >= numlumps",lump);
@@ -391,7 +391,7 @@ int W_LumpLength (int lump)
//
void
W_ReadLump
-( int lump,
+( unsigned int lump,
void* dest )
{
int c;
@@ -543,7 +543,7 @@ void W_Profile (void)
void W_GenerateHashTable(void)
{
- int i;
+ unsigned int i;
// Free the old hash table, if there is one
diff --git a/src/w_wad.h b/src/w_wad.h
index 9e65fb1e..bf010d5b 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -74,7 +74,7 @@ struct lumpinfo_s
extern void** lumpcache;
extern lumpinfo_t* lumpinfo;
-extern int numlumps;
+extern unsigned int numlumps;
FILE *W_AddFile (char *filename);
void W_Reload (void);
@@ -82,8 +82,8 @@ void W_Reload (void);
int W_CheckNumForName (char* name);
int W_GetNumForName (char* name);
-int W_LumpLength (int lump);
-void W_ReadLump (int lump, void *dest);
+int W_LumpLength (unsigned int lump);
+void W_ReadLump (unsigned int lump, void *dest);
void* W_CacheLumpNum (int lump, int tag);
void* W_CacheLumpName (char* name, int tag);