From 55d1613ea4ff5146bc065fdda0ce61318844d6ce Mon Sep 17 00:00:00 2001 From: Kevin Caccamo Date: Tue, 28 Aug 2018 12:04:42 -0400 Subject: [PATCH] Update usage of LastIndexOf Now that LastIndexOf works properly, update the code that uses it to find OBJ models Also, make UE1 model finder use LastIndexOf --- src/r_data/models/models.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/r_data/models/models.cpp b/src/r_data/models/models.cpp index 690d7c75f..178aabb6c 100644 --- a/src/r_data/models/models.cpp +++ b/src/r_data/models/models.cpp @@ -420,7 +420,7 @@ static unsigned FindModel(const char * path, const char * modelfile) FMemLump lumpd = Wads.ReadLump(lump); char * buffer = (char*)lumpd.GetMem(); - if ( (size_t)fullname.IndexOf("_d.3d") == fullname.Len()-5 ) + if ( (size_t)fullname.LastIndexOf("_d.3d") == fullname.Len()-5 ) { FString anivfile = fullname.GetChars(); anivfile.Substitute("_d.3d","_a.3d"); @@ -429,7 +429,7 @@ static unsigned FindModel(const char * path, const char * modelfile) model = new FUE1Model; } } - else if ( (size_t)fullname.IndexOf("_a.3d") == fullname.Len()-5 ) + else if ( (size_t)fullname.LastIndexOf("_a.3d") == fullname.Len()-5 ) { FString datafile = fullname.GetChars(); datafile.Substitute("_a.3d","_d.3d"); @@ -438,8 +438,8 @@ static unsigned FindModel(const char * path, const char * modelfile) model = new FUE1Model; } } - else if ( (size_t)fullname.LastIndexOf(".obj") == fullname.Len() - 1 ) - { // LastIndexOf works differently than it does in JavaScript + else if ( (size_t)fullname.LastIndexOf(".obj") == fullname.Len() - 4 ) + { model = new FOBJModel; } else if (!memcmp(buffer, "DMDM", 4))