From fd462c9b55ebc51cc6e30dc399bf933952136034 Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 5 May 2020 13:04:29 +0200 Subject: [PATCH] implemented most of streamed collisions and big buildings --- src/core/Collision.h | 2 -- src/modelinfo/SimpleModelInfo.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/Collision.h b/src/core/Collision.h index 4933606d..fc3c1647 100644 --- a/src/core/Collision.h +++ b/src/core/Collision.h @@ -87,10 +87,8 @@ struct CStoredCollPoly struct CColModel { -#ifndef MIAMI CColSphere boundingSphere; CColBox boundingBox; -#endif int16 numSpheres; int16 numLines; int16 numBoxes; diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/modelinfo/SimpleModelInfo.cpp index 424fb0e5..63b057da 100644 --- a/src/modelinfo/SimpleModelInfo.cpp +++ b/src/modelinfo/SimpleModelInfo.cpp @@ -130,6 +130,7 @@ CSimpleModelInfo::GetAtomicFromDistance(float dist) return nil; } +#ifdef MIAMI RpAtomic* CSimpleModelInfo::GetFirstAtomicFromDistance(float dist) { @@ -137,6 +138,7 @@ CSimpleModelInfo::GetFirstAtomicFromDistance(float dist) return m_atomics[0]; return nil; } +#endif void CSimpleModelInfo::FindRelatedModel(void)