PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-14 19:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change CEntity::SetActive argument to uchar

Browse Source 
Former-commit-id: c6d3f0ae8b
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-17 18:59:36 +03:00
parent 8bb6d3442b
commit c7f154e26a
148 changed files with 164 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/MetroidPrime/CActor.hpp
View File

@@ -213,7 +213,7 @@ public:
~CActor() override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void SetActive(bool active) override;
void SetActive(uchar active) override;
virtual void PreRender(CStateManager&, const CFrustumPlanes&);
virtual void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const;

4
include/MetroidPrime/CEntity.hpp
View File

@@ -18,7 +18,7 @@ public:
virtual void PreThink(float dt, CStateManager& mgr);
virtual void Think(float dt, CStateManager& mgr);
virtual void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
virtual void SetActive(bool active);
virtual void SetActive(uchar active);
CEntity(TUniqueId id, const CEntityInfo& info, bool active, const rstl::string& name);
@@ -46,7 +46,7 @@ protected:
TEditorId xc_editorId;
rstl::string x10_name;
rstl::vector< SConnection > x20_conns;
bool x30_24_active : 1;
uchar x30_24_active : 1;
bool x30_25_inGraveyard : 1;
bool x30_26_scriptingBlocked : 1;
bool x30_27_notInArea : 1;