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

CEntity const meme fixes

Browse Source
This commit is contained in:
Phillip Stephens
2025-05-23 13:36:07 -07:00
parent 4231165ff5
commit b9019bbcbe
23 changed files with 95 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp
View File

@@ -10,8 +10,8 @@ class CScriptPlatform;
class CScriptActorRotate : public CEntity {
public:
CScriptActorRotate(TUniqueId, const rstl::string&, const CEntityInfo&, const CVector3f&, float,
bool, bool, bool);
CScriptActorRotate(TUniqueId, const rstl::string&, const CEntityInfo&, const CVector3f&,
const float, const bool, const bool, const bool);
~CScriptActorRotate();
void Accept(IVisitor& visitor) override;
@@ -23,9 +23,9 @@ private:
float x40_maxTime;
float x44_currentTime; // = 0.f;
// rstl::map< TUniqueId, CTransform4f > x48_actors;
rstl::vector< rstl::pair<TUniqueId, CTransform4f> > x48_actors;
rstl::vector< rstl::pair< TUniqueId, CTransform4f > > x48_actors;
bool x58_24_updateRotation : 1; // = false;
bool x58_24_updateRotation : 1; // = false;
bool x58_25_updateSpiderBallWaypoints : 1; // = false;
bool x58_26_updateActors : 1;
bool x58_27_updateOnCreation : 1;

8
include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp
View File

@@ -16,13 +16,13 @@ class CScriptAreaAttributes : public CEntity {
EPhazonType x50_phazon;
public:
CScriptAreaAttributes(TUniqueId uid, const CEntityInfo& info, bool showSkybox, EEnvFxType fxType, float envFxDensity,
float thermalHeat, float xrayFogDistance, float worldLightingLevel, CAssetId skybox,
EPhazonType phazonType);
CScriptAreaAttributes(TUniqueId uid, const CEntityInfo& info, bool showSkybox, EEnvFxType fxType,
float envFxDensity, float thermalHeat, float xrayFogDistance,
float worldLightingLevel, CAssetId skybox, EPhazonType phazonType);
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;
void Accept(IVisitor& visitor) override;
~CScriptAreaAttributes();
~CScriptAreaAttributes() {}
bool GetNeedsSky() const { return x34_24_showSkybox; }
bool GetNeedsEnvFx() const { return x38_envFx != kEFX_None; }

5
include/MetroidPrime/ScriptObjects/CScriptCounter.hpp
View File

@@ -7,10 +7,11 @@ class CScriptCounter : public CEntity {
int x34_initial;
int x38_current;
int x3c_max;
uchar x40_autoReset;
bool x40_autoReset;
public:
CScriptCounter(TUniqueId, const rstl::string& name, const CEntityInfo& info, int, int, bool, bool);
CScriptCounter(TUniqueId, const rstl::string& name, const CEntityInfo& info, int, int, bool,
bool);
~CScriptCounter();
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override;

4
include/MetroidPrime/ScriptObjects/CScriptSwitch.hpp
View File

@@ -14,8 +14,8 @@ public:
~CScriptSwitch();
private:
uchar mOpened;
uchar mCloseOnOpened;
bool mOpened;
bool mCloseOnOpened;
};
#endif // _CSCRIPTSWITCH