GCC compile fixes.

SVN r189 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-14 20:24:43 +00:00
parent fd79fac52c
commit 6e19881b6f
2 changed files with 8 additions and 8 deletions

View file

@ -187,7 +187,7 @@ static void P_SetSideNum (DWORD *sidenum_p, WORD sidenum);
static int GetMapIndex(const char * mapname, int lastindex, const char * lumpname) static int GetMapIndex(const char * mapname, int lastindex, const char * lumpname)
{ {
static struct static struct checkstruct
{ {
char * lumpname; char * lumpname;
bool required; bool required;
@ -923,7 +923,7 @@ void P_LoadSegs (MapData * map)
void P_LoadSubsectors (MapData * map) void P_LoadSubsectors (MapData * map)
{ {
int i; int i;
int maxseg = map->Size(ML_SEGS) / sizeof(mapseg_t); DWORD maxseg = map->Size(ML_SEGS) / sizeof(mapseg_t);
numsubsectors = map->MapLumps[ML_SSECTORS].Size / sizeof(mapsubsector_t); numsubsectors = map->MapLumps[ML_SSECTORS].Size / sizeof(mapsubsector_t);

View file

@ -51,26 +51,26 @@ struct MapData
file = NULL; file = NULL;
} }
void Seek(int lumpindex) void Seek(unsigned int lumpindex)
{ {
if (lumpindex>=0 && lumpindex<countof(MapLumps)) if (lumpindex<countof(MapLumps))
{ {
file->Seek(MapLumps[lumpindex].FilePos, SEEK_SET); file->Seek(MapLumps[lumpindex].FilePos, SEEK_SET);
} }
} }
void Read(int lumpindex, void * buffer) void Read(unsigned int lumpindex, void * buffer)
{ {
if (lumpindex>=0 && lumpindex<countof(MapLumps)) if (lumpindex<countof(MapLumps))
{ {
file->Seek(MapLumps[lumpindex].FilePos, SEEK_SET); file->Seek(MapLumps[lumpindex].FilePos, SEEK_SET);
file->Read(buffer, MapLumps[lumpindex].Size); file->Read(buffer, MapLumps[lumpindex].Size);
} }
} }
DWORD Size(int lumpindex) DWORD Size(unsigned int lumpindex)
{ {
if (lumpindex>=0 && lumpindex<countof(MapLumps)) if (lumpindex<countof(MapLumps))
{ {
return MapLumps[lumpindex].Size; return MapLumps[lumpindex].Size;
} }