summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-05 13:04:29 +0200
committeraap <aap@papnet.eu>2020-05-05 14:00:20 +0200
commitfd462c9b55ebc51cc6e30dc399bf933952136034 (patch)
tree1d10764d5265fc168eb8939a329103a4ab83696e
parentimplemented most of streamed collisions and big buildings (diff)
downloadre3-fd462c9b55ebc51cc6e30dc399bf933952136034.tar
re3-fd462c9b55ebc51cc6e30dc399bf933952136034.tar.gz
re3-fd462c9b55ebc51cc6e30dc399bf933952136034.tar.bz2
re3-fd462c9b55ebc51cc6e30dc399bf933952136034.tar.lz
re3-fd462c9b55ebc51cc6e30dc399bf933952136034.tar.xz
re3-fd462c9b55ebc51cc6e30dc399bf933952136034.tar.zst
re3-fd462c9b55ebc51cc6e30dc399bf933952136034.zip
Diffstat (limited to '')
-rw-r--r--src/core/Collision.h2
-rw-r--r--src/modelinfo/SimpleModelInfo.cpp2
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)