diff options
| author | aap <aap@papnet.eu> | 2020-05-05 14:21:13 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-05 14:21:13 +0200 |
| commit | b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257 (patch) | |
| tree | c300d6c36323e27226fe7ad0782cf945a26859f8 /src/core/FileLoader.cpp | |
| parent | implemented most of streamed collisions and big buildings (diff) | |
| parent | Make CBaseModelInfo fields protected (diff) | |
| download | re3-b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257.tar re3-b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257.tar.gz re3-b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257.tar.bz2 re3-b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257.tar.lz re3-b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257.tar.xz re3-b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257.tar.zst re3-b3b9be5e8cc5ac5d1ec262fc95ac094d10b02257.zip | |
Diffstat (limited to 'src/core/FileLoader.cpp')
| -rw-r--r-- | src/core/FileLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 06eb5a34..ab09d72f 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -235,7 +235,7 @@ CFileLoader::LoadCollisionFile(const char *filename, uint8 colSlot) #ifndef MIAMI if(mi->GetColModel()){ #else - if(mi->GetColModel() && mi->m_bOwnsColModel){ + if(mi->GetColModel() && mi->DoesOwnColModel()){ #endif LoadCollisionModel(work_buff+24, *mi->GetColModel(), modelname); }else{ @@ -506,7 +506,7 @@ CFileLoader::LoadClumpFile(RwStream *stream, uint32 id) return false; mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(id); mi->SetClump(clump); - if(mi->m_type == MITYPE_PED && id != 0 && RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){ + if (mi->GetModelType() == MITYPE_PED && id != 0 && RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)) { // Read LOD ped clump = RpClumpStreamRead(stream); if(clump){ @@ -1481,7 +1481,7 @@ CFileLoader::ReloadObject(const char *line) #ifdef FIX_BUGS mi && #endif - mi->m_type == MITYPE_SIMPLE && !strcmp(mi->GetName(), model) && mi->m_numAtomics == numObjs) { + mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetName(), model) && mi->m_numAtomics == numObjs) { mi->SetLodDistances(dist); SetModelInfoFlags(mi, flags); } else { |