- fixed compilation warnings reported by GCC/Clang

src/r_data/models/models.cpp:418:33: warning: comparison of integers of different signs: 'long' and 'unsigned long' [-Wsign-compare]
src/r_data/models/models.cpp:427:38: warning: comparison of integers of different signs: 'long' and 'unsigned long' [-Wsign-compare]
src/r_data/models/models_ue1.cpp:49:37: warning: comparison of integers of different signs: 'long' and 'unsigned long' [-Wsign-compare]
This commit is contained in:
alexey.lysiuk 2018-05-19 13:28:53 +03:00
parent ace5ee3c41
commit 9257c9cc0c
2 changed files with 3 additions and 3 deletions

View file

@ -415,7 +415,7 @@ static unsigned FindModel(const char * path, const char * modelfile)
FMemLump lumpd = Wads.ReadLump(lump); FMemLump lumpd = Wads.ReadLump(lump);
char * buffer = (char*)lumpd.GetMem(); char * buffer = (char*)lumpd.GetMem();
if ( fullname.IndexOf("_d.3d") == fullname.Len()-5 ) if ( (size_t)fullname.IndexOf("_d.3d") == fullname.Len()-5 )
{ {
FString anivfile = fullname.GetChars(); FString anivfile = fullname.GetChars();
anivfile.Substitute("_d.3d","_a.3d"); anivfile.Substitute("_d.3d","_a.3d");
@ -424,7 +424,7 @@ static unsigned FindModel(const char * path, const char * modelfile)
model = new FUE1Model; model = new FUE1Model;
} }
} }
else if ( fullname.IndexOf("_a.3d") == fullname.Len()-5 ) else if ( (size_t)fullname.IndexOf("_a.3d") == fullname.Len()-5 )
{ {
FString datafile = fullname.GetChars(); FString datafile = fullname.GetChars();
datafile.Substitute("_a.3d","_d.3d"); datafile.Substitute("_a.3d","_d.3d");

View file

@ -46,7 +46,7 @@ bool FUE1Model::Load( const char *filename, int lumpnum, const char *buffer, int
FMemLump lump2; FMemLump lump2;
const char *buffer2; const char *buffer2;
FString realfilename = Wads.GetLumpFullName(lumpnum); FString realfilename = Wads.GetLumpFullName(lumpnum);
if ( realfilename.IndexOf("_d.3d") == realfilename.Len()-5 ) if ( (size_t)realfilename.IndexOf("_d.3d") == realfilename.Len()-5 )
{ {
realfilename.Substitute("_d.3d","_a.3d"); realfilename.Substitute("_d.3d","_a.3d");
lumpnum2 = Wads.CheckNumForFullName(realfilename); lumpnum2 = Wads.CheckNumForFullName(realfilename);