diff options
Diffstat (limited to 'src/collision/ColModel.h')
| -rw-r--r-- | src/collision/ColModel.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/collision/ColModel.h b/src/collision/ColModel.h index 7dcdfa4d..64f05f76 100644 --- a/src/collision/ColModel.h +++ b/src/collision/ColModel.h @@ -9,14 +9,14 @@ struct CColModel { - CColSphere boundingSphere; - CColBox boundingBox; + CSphere boundingSphere; + CBox boundingBox; int16 numSpheres; - int16 numLines; int16 numBoxes; int16 numTriangles; - int32 level; - bool ownsCollisionVolumes; // missing on PS2 + int8 numLines; + uint8 level; // colstore slot but probably still named level + bool ownsCollisionVolumes; CColSphere *spheres; CColLine *lines; CColBox *boxes; @@ -33,5 +33,7 @@ struct CColModel void SetLinkPtr(CLink<CColModel*>*); void GetTrianglePoint(CVector &v, int i) const; + void *operator new(size_t) throw(); + void operator delete(void *p, size_t) throw(); CColModel& operator=(const CColModel& other); };
\ No newline at end of file |