2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00

Various CActorContraption fixes

This commit is contained in:
Jack Andersen
2019-06-14 14:39:20 -10:00
parent 6679f6de72
commit 37307e1cf6
17 changed files with 82 additions and 34 deletions

View File

@@ -9,18 +9,23 @@ class CScriptCameraHintTrigger : public CActor {
zeus::CVector3f x124_scale;
union {
struct {
bool x130_24_ : 1;
bool x130_25_ : 1;
bool x130_26_ : 1;
bool x130_27_ : 1;
bool x130_24_deactivateOnEnter : 1;
bool x130_25_deactivateOnExit : 1;
bool x130_26_playerInside : 1;
bool x130_27_playerWasInside : 1;
};
u8 _dummy = 0;
u32 _dummy = 0;
};
public:
CScriptCameraHintTrigger(TUniqueId, bool, std::string_view name, const CEntityInfo&, const zeus::CVector3f&,
const zeus::CTransform&, bool, bool);
CScriptCameraHintTrigger(TUniqueId uid, bool active, std::string_view name,
const CEntityInfo& info, const zeus::CVector3f& scale,
const zeus::CTransform& xf, bool deactivateOnEnter,
bool deactivateOnExit);
void Accept(IVisitor& visitor);
void Think(float dt, CStateManager& mgr);
void Touch(CActor& other, CStateManager& mgr);
std::optional<zeus::CAABox> GetTouchBounds() const;
};
} // namespace urde