summaryrefslogtreecommitdiff
path: root/src/engine/objects/Thwomp.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/objects/Thwomp.h')
-rw-r--r--src/engine/objects/Thwomp.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/objects/Thwomp.h b/src/engine/objects/Thwomp.h
index 22c674bb5..c66705312 100644
--- a/src/engine/objects/Thwomp.h
+++ b/src/engine/objects/Thwomp.h
@@ -22,16 +22,16 @@ extern "C" {
/**
* Thwomp OObject
- *
+ *
* The game automatically places the actor on the ground so you do not need to provide a Y coordinate value.
- *
+ *
* @arg direction the rotational direction the thwomp is facing.
* @arg behaviour the behaviour of the thwomp, uses values 1-6.
* @arg primAlpha unknown
* @arg boundingBoxSize optional. The size of the bounding box for the thwomp. Default value is 12
*/
class OThwomp : public OObject {
-private:
+ private:
enum States : uint16_t {
DISABLED,
STATIONARY,
@@ -42,7 +42,7 @@ private:
JAILED // Has no collision
};
-public:
+ public:
States State = States::DISABLED;
explicit OThwomp(s16 x, s16 z, s16 direction, f32 scale, s16 behaviour, s16 primAlpha, u16 boundingBoxSize = 7);
@@ -110,7 +110,8 @@ public:
void func_8008078C(s32 objectIndex);
void func_8007E63C(s32 objectIndex);
-private:
+
+ private:
static size_t _count;
s32 _idx;
s16 _faceDirection;