diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
commit | 9960c411933f9a804eb5f6840d75ad00fd255252 (patch) | |
tree | 19886c3263958d5c77664518270d252ad5554602 /src/modelinfo | |
parent | Merge pull request #512 from Nick007J/master (diff) | |
download | re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.gz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.bz2 re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.lz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.xz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.zst re3-9960c411933f9a804eb5f6840d75ad00fd255252.zip |
Diffstat (limited to 'src/modelinfo')
-rw-r--r-- | src/modelinfo/ModelInfo.cpp | 16 | ||||
-rw-r--r-- | src/modelinfo/ModelInfo.h | 3 | ||||
-rw-r--r-- | src/modelinfo/SimpleModelInfo.cpp | 10 | ||||
-rw-r--r-- | src/modelinfo/SimpleModelInfo.h | 3 |
4 files changed, 0 insertions, 32 deletions
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp index 62deae2b..da09bdfa 100644 --- a/src/modelinfo/ModelInfo.cpp +++ b/src/modelinfo/ModelInfo.cpp @@ -200,20 +200,6 @@ CModelInfo::GetModelInfo(const char *name, int *id) return nil; } -#ifdef MIAMI -CBaseModelInfo* -CModelInfo::GetModelInfo(const char *name, int minIndex, int maxIndex) -{ - CBaseModelInfo *modelinfo; - for(int i = minIndex; i <= maxIndex; i++){ - modelinfo = CModelInfo::ms_modelInfoPtrs[i]; - if(modelinfo && !CGeneral::faststricmp(modelinfo->GetName(), name)) - return modelinfo; - } - return nil; -} -#endif - bool CModelInfo::IsBoatModel(int32 id) { @@ -228,7 +214,6 @@ CModelInfo::IsBikeModel(int32 id) ((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_BIKE; } -#ifndef MIAMI void CModelInfo::RemoveColModelsFromOtherLevels(eLevelName level) { @@ -245,7 +230,6 @@ CModelInfo::RemoveColModelsFromOtherLevels(eLevelName level) } } } -#endif void CModelInfo::ConstructMloClumps() diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h index dadc8f8b..65cfa4e7 100644 --- a/src/modelinfo/ModelInfo.h +++ b/src/modelinfo/ModelInfo.h @@ -42,9 +42,6 @@ public: static CBaseModelInfo *GetModelInfo(int id){ return ms_modelInfoPtrs[id]; } -#ifdef MIAMI - static CBaseModelInfo *GetModelInfo(const char *name, int minIndex, int maxIndex); -#endif static bool IsBoatModel(int32 id); static bool IsBikeModel(int32 id); diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/modelinfo/SimpleModelInfo.cpp index 63b057da..36e98e18 100644 --- a/src/modelinfo/SimpleModelInfo.cpp +++ b/src/modelinfo/SimpleModelInfo.cpp @@ -130,16 +130,6 @@ CSimpleModelInfo::GetAtomicFromDistance(float dist) return nil; } -#ifdef MIAMI -RpAtomic* -CSimpleModelInfo::GetFirstAtomicFromDistance(float dist) -{ - if(dist < m_lodDistances[0] * TheCamera.LODDistMultiplier) - return m_atomics[0]; - return nil; -} -#endif - void CSimpleModelInfo::FindRelatedModel(void) { diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h index 451a9c00..8c4173e9 100644 --- a/src/modelinfo/SimpleModelInfo.h +++ b/src/modelinfo/SimpleModelInfo.h @@ -40,9 +40,6 @@ public: float GetNearDistance(void); float GetLargestLodDistance(void); RpAtomic *GetAtomicFromDistance(float dist); -#ifdef MIAMI - RpAtomic *GetFirstAtomicFromDistance(float dist); // inline -#endif void FindRelatedModel(void); void SetupBigBuilding(void); |