diff options
| author | aap <aap@papnet.eu> | 2020-05-05 13:02:42 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-05 13:02:42 +0200 |
| commit | b44df26d3ea5fcdaf6d954016303f358d2c64b79 (patch) | |
| tree | 2921c2c0e2883117f4ce9cec73865c1701f32cec /src/core/Collision.h | |
| parent | SetPosition, final part (diff) | |
| download | re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.gz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.bz2 re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.lz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.xz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.zst re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.zip | |
Diffstat (limited to 'src/core/Collision.h')
| -rw-r--r-- | src/core/Collision.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/core/Collision.h b/src/core/Collision.h index bdf51eb8..4933606d 100644 --- a/src/core/Collision.h +++ b/src/core/Collision.h @@ -87,13 +87,19 @@ struct CStoredCollPoly struct CColModel { +#ifndef MIAMI CColSphere boundingSphere; CColBox boundingBox; - short numSpheres; - short numLines; - short numBoxes; - short numTriangles; - int level; +#endif + int16 numSpheres; + int16 numLines; + int16 numBoxes; + int16 numTriangles; +#ifndef MIAMI + int32 level; +#else + uint8 level; // colstore slot but probably same name +#endif bool ownsCollisionVolumes; CColSphere *spheres; CColLine *lines; |