zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-12 14:45:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary checks.

Browse source 
(cherry picked from commit 98f279b651)
This commit is contained in:
Marisa Kirisame 2018-05-15 10:33:24 +02:00 committed by drfrag666
parent 91acd10e75
commit e2b3dc1c74
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/r_data/models/models.cpp
View file

@ -416,7 +416,6 @@ 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();
bool isunreal3d = false;
if ( fullname.IndexOf("_d.3d") == fullname.Len()-5 ) if ( fullname.IndexOf("_d.3d") == fullname.Len()-5 )
{ {
FString anivfile = fullname.GetChars(); FString anivfile = fullname.GetChars();
@ -424,7 +423,6 @@ static unsigned FindModel(const char * path, const char * modelfile)
if ( Wads.CheckNumForFullName(anivfile) > 0 ) if ( Wads.CheckNumForFullName(anivfile) > 0 )
{ {
model = new FUE1Model; model = new FUE1Model;
isunreal3d = true;
} }
} }
else if ( fullname.IndexOf("_a.3d") == fullname.Len()-5 ) else if ( fullname.IndexOf("_a.3d") == fullname.Len()-5 )
@ -434,23 +432,19 @@ static unsigned FindModel(const char * path, const char * modelfile)
if ( Wads.CheckNumForFullName(datafile) > 0 ) if ( Wads.CheckNumForFullName(datafile) > 0 )
{ {
model = new FUE1Model; model = new FUE1Model;
isunreal3d = true;
} }
} }
if ( !isunreal3d ) else if (!memcmp(buffer, "DMDM", 4))
{ {
if (!memcmp(buffer, "DMDM", 4)) model = new FDMDModel;
{ }
model = new FDMDModel; else if (!memcmp(buffer, "IDP2", 4))
} {
else if (!memcmp(buffer, "IDP2", 4)) model = new FMD2Model;
{ }
model = new FMD2Model; else if (!memcmp(buffer, "IDP3", 4))
} {
else if (!memcmp(buffer, "IDP3", 4)) model = new FMD3Model;
{
model = new FMD3Model;
}
} }
if (model != nullptr) if (model != nullptr)