PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-11 07:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

const bool fixes, remove override define

Browse Source 
Former-commit-id: 72256e77a5
This commit is contained in:
Phillip Stephens
2023-02-05 23:21:28 -08:00
parent f29f76abb5
commit 38b824cda0
296 changed files with 1192 additions and 1199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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(uchar active);
virtual void SetActive(const bool active);
CEntity(TUniqueId id, const CEntityInfo& info, bool active, const rstl::string& name);
@@ -32,7 +32,7 @@ public:
const rstl::string& GetDebugName() const { return x10_name; }
TAreaId GetAreaId() const;
TAreaId GetCurrentAreaId() const { return x4_areaId; }
uchar GetActive() const { return x30_24_active; }
const bool GetActive() const { return x30_24_active; }
bool IsScriptingBlocked() const { return x30_26_scriptingBlocked; }
// might be fake?
@@ -47,7 +47,7 @@ private:
TEditorId xc_editorId;
rstl::string x10_name;
rstl::vector< SConnection > x20_conns;
uchar x30_24_active : 1;
bool x30_24_active : 1;
bool x30_25_inGraveyard : 1;
bool x30_26_scriptingBlocked : 1;
bool x30_27_notInArea : 1;