diff options
| author | aap <aap@papnet.eu> | 2020-05-05 18:06:38 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-05 18:06:38 +0200 |
| commit | e81652c2fc2787fc8aab3937be62127e7a3354ee (patch) | |
| tree | c36897c90f4f37796ec955c49e70e99944de7dda /src/core/Collision.h | |
| parent | Merge pull request #514 from Nick007J/miami (diff) | |
| download | re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.gz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.bz2 re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.lz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.xz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.zst re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/Collision.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/Collision.h b/src/core/Collision.h index fc3c1647..18fad76b 100644 --- a/src/core/Collision.h +++ b/src/core/Collision.h @@ -87,17 +87,14 @@ struct CStoredCollPoly struct CColModel { + // TODO(MIAMI): CSphere and CBox CColSphere boundingSphere; CColBox boundingBox; int16 numSpheres; int16 numLines; int16 numBoxes; int16 numTriangles; -#ifndef MIAMI - int32 level; -#else - uint8 level; // colstore slot but probably same name -#endif + uint8 level; // colstore slot but probably still named level bool ownsCollisionVolumes; CColSphere *spheres; CColLine *lines; |