CEntity const meme fixes

include/MetroidPrime/CEntity.hpp

@@ -20,9 +20,10 @@ public:
   virtual void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr);
   virtual void SetActive(const bool active);
 
-  CEntity(TUniqueId id, const CEntityInfo& info, bool active, const rstl::string& name);
+  CEntity(TUniqueId id, const CEntityInfo& info, const bool active, const rstl::string& name);
 
-  void SendScriptMsgs(const EScriptObjectState state, CStateManager& mgr, const EScriptObjectMessage msg);
+  void SendScriptMsgs(const EScriptObjectState state, CStateManager& mgr,
+                      const EScriptObjectMessage msg);
   TUniqueId GetUniqueId() const { return x8_uid; }
   TEditorId GetEditorId() const { return xc_editorId; }
   const rstl::string& GetDebugName() const { return x10_name; }

include/MetroidPrime/CGameArea.hpp

@@ -166,8 +166,12 @@ public:
       CChainIterator::operator++();
       return *this;
     }
-    bool operator!=(const CConstChainIterator& other) const { return !CChainIterator::operator==(other); }
+    bool operator!=(const CConstChainIterator& other) const {
-    bool operator==(const CConstChainIterator& other) const { return CChainIterator::operator==(other); }
+      return !CChainIterator::operator==(other);
+    }
+    bool operator==(const CConstChainIterator& other) const {
+      return CChainIterator::operator==(other);
+    }
   };
 
   enum EOcclusionState { kOS_Occluded, kOS_Visible };
@@ -217,7 +221,7 @@ public:
   void SetThermalSpeedAndTarget(float speed, float target);
   void SetWeaponWorldLighting(float speed, float target);
 
-  void SetAreaAttributes(const CScriptAreaAttributes* areaAttributes);
+  void SetAreaAttributes(CScriptAreaAttributes* areaAttributes);
   bool TryTakingOutOfARAM();
 
   bool StartStreamingMainArea();

include/MetroidPrime/ScriptObjects/CScriptActorRotate.hpp

@@ -10,8 +10,8 @@ class CScriptPlatform;
 
 class CScriptActorRotate : public CEntity {
 public:
-  CScriptActorRotate(TUniqueId, const rstl::string&, const CEntityInfo&, const CVector3f&, float,
+  CScriptActorRotate(TUniqueId, const rstl::string&, const CEntityInfo&, const CVector3f&,
-                     bool, bool, bool);
+                     const float, const bool, const bool, const bool);
   ~CScriptActorRotate();
 
   void Accept(IVisitor& visitor) override;
@@ -23,7 +23,7 @@ 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_25_updateSpiderBallWaypoints : 1; // = false;

include/MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp

@@ -16,13 +16,13 @@ class CScriptAreaAttributes : public CEntity {
   EPhazonType x50_phazon;
 
 public:
-  CScriptAreaAttributes(TUniqueId uid, const CEntityInfo& info, bool showSkybox, EEnvFxType fxType, float envFxDensity,
+  CScriptAreaAttributes(TUniqueId uid, const CEntityInfo& info, bool showSkybox, EEnvFxType fxType,
-                        float thermalHeat, float xrayFogDistance, float worldLightingLevel, CAssetId skybox,
+                        float envFxDensity, float thermalHeat, float xrayFogDistance,
-                        EPhazonType phazonType);
+                        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; }

include/MetroidPrime/ScriptObjects/CScriptCounter.hpp

@@ -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;

include/MetroidPrime/ScriptObjects/CScriptSwitch.hpp

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

src/MetroidPrime/ScriptObjects/CScriptActorRotate.cpp

@@ -12,8 +12,8 @@
 
 CScriptActorRotate::CScriptActorRotate(TUniqueId uid, const rstl::string& name,
                                        const CEntityInfo& info, const CVector3f& rotation,
-                                       float maxTime, bool updateActors, bool updateOnCreation,
+                                       float maxTime, const bool updateActors,
-                                       bool active)
+                                       const bool updateOnCreation, const bool active)
 : CEntity(uid, info, active, name)
 , x34_rotation(rotation)
 , x40_maxTime(maxTime)

src/MetroidPrime/ScriptObjects/CScriptAreaAttributes.cpp

@@ -1,4 +1,6 @@
 #include "MetroidPrime/ScriptObjects/CScriptAreaAttributes.hpp"
+#include "MetroidPrime/CGameArea.hpp"
+#include "MetroidPrime/TGameTypes.hpp"
 
 CScriptAreaAttributes::CScriptAreaAttributes(TUniqueId uid, const CEntityInfo& info,
                                              bool showSkybox, EEnvFxType fxType, float envFxDensity,
@@ -31,14 +33,14 @@ void CScriptAreaAttributes::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
   }
 
   case kSM_Deleted: {
-    if (stateMgr.World()->IsAreaValid(GetCurrentAreaId())) {
+    if (stateMgr.World()->Area(GetCurrentAreaId())->IsLoaded()) {
       stateMgr.World()->Area(GetCurrentAreaId())->SetAreaAttributes(nullptr);
     }
     break;
   }
+  default:
+    break;
   }
 }
 
 void CScriptAreaAttributes::Accept(IVisitor& visitor) { visitor.Visit(*this); }
-
-CScriptAreaAttributes::~CScriptAreaAttributes() {}

src/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.cpp

@@ -4,9 +4,10 @@
 
 CScriptCameraBlurKeyframe::CScriptCameraBlurKeyframe(TUniqueId uid, const rstl::string& name,
                                                      const CEntityInfo& info,
-                                                     CCameraBlurPass::EBlurType type, float amount,
+                                                     const CCameraBlurPass::EBlurType type,
-                                                     u32 unk, float timeIn, float timeOut,
+                                                     const float amount, const u32 unk,
-                                                     bool active)
+                                                     const float timeIn, const float timeOut,
+                                                     const bool active)
 : CEntity(uid, info, active, name)
 , x34_type(type)
 , x38_amount(amount)
@@ -23,7 +24,8 @@ void CScriptCameraBlurKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqu
   switch (msg) {
   case kSM_Increment:
     if (GetActive()) {
-      stateMgr.CameraBlurPass(CStateManager::kCFS_Three).SetBlur(x34_type, x38_amount, x40_timeIn, false);
+      stateMgr.CameraBlurPass(CStateManager::kCFS_Three)
+          .SetBlur(x34_type, x38_amount, x40_timeIn, false);
     }
     break;
   case kSM_Decrement:

src/MetroidPrime/ScriptObjects/CScriptCameraShaker.cpp

@@ -5,9 +5,8 @@
 #include "MetroidPrime/CWorld.hpp"
 #include "MetroidPrime/Cameras/CCameraManager.hpp"
 
-
 CScriptCameraShaker::CScriptCameraShaker(TUniqueId uid, const rstl::string& name,
-                                         const CEntityInfo& info, bool active,
+                                         const CEntityInfo& info, const bool active,
                                          const CCameraShakeData& shakeData)
 : CEntity(uid, info, active, name), x34_shakeData(shakeData) {}
 

src/MetroidPrime/ScriptObjects/CScriptControllerAction.cpp

@@ -3,10 +3,10 @@
 #include "MetroidPrime/CStateManager.hpp"
 
 CScriptControllerAction::CScriptControllerAction(TUniqueId uid, const rstl::string& name,
-                                                 const CEntityInfo& info, bool active,
+                                                 const CEntityInfo& info, const bool active,
-                                                 ECommands command,
+                                                 const ECommands command,
-                                                 bool mapScreenResponse, uint w1,
+                                                 const bool mapScreenResponse, const uint w1,
-                                                 bool deactivateOnClose)
+                                                 const bool deactivateOnClose)
 : CEntity(uid, info, active, name)
 , x34_command(command)
 , x38_mapScreenSubaction(w1)
@@ -51,7 +51,6 @@ void CScriptControllerAction::Think(float dt, CStateManager& stateMgr) {
   }
 }
 
-ControlMapper::ECommands
+ControlMapper::ECommands CScriptControllerAction::GetCommand(CScriptControllerAction::ECommands c) {
-CScriptControllerAction::GetCommand(CScriptControllerAction::ECommands c) {
   return (ControlMapper::ECommands)(c);
 }

src/MetroidPrime/ScriptObjects/CScriptCounter.cpp

@@ -1,7 +1,8 @@
 #include "MetroidPrime/ScriptObjects/CScriptCounter.hpp"
 
-CScriptCounter::CScriptCounter(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
+CScriptCounter::CScriptCounter(const TUniqueId uid, const rstl::string& name,
-                               int initial, int max, bool autoReset, bool active)
+                               const CEntityInfo& info, const int initial, const int max,
+                               const bool autoReset, const bool active)
 : CEntity(uid, info, active, name)
 , x34_initial(initial)
 , x38_current(initial)

src/MetroidPrime/ScriptObjects/CScriptHUDMemo.cpp

@@ -5,8 +5,8 @@
 #include "Kyoto/Text/CStringTable.hpp"
 
 CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
-                               const CHUDMemoParms& parms, CScriptHUDMemo::EDisplayType disp,
+                               const CHUDMemoParms& parms, const EDisplayType disp, CAssetId msg,
-                               CAssetId msg, bool active)
+                               const bool active)
 : CEntity(uid, info, active, name)
 , x34_parms(parms)
 , x3c_dispType(disp)
@@ -17,8 +17,7 @@ CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, const rstl::string& name, const CE
 
 CScriptHUDMemo::~CScriptHUDMemo() {}
 
-void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
+void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
-                                     CStateManager& mgr) {
   switch (msg) {
   case kSM_SetToZero:
     if (GetActive()) {
@@ -38,6 +37,8 @@ void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
       CSamusHud::DisplayHudMemo(rstl::wstring_l(L""), CHUDMemoParms(0.f, false, true, false));
     }
     break;
+  default:
+    break;
   }
 
   CEntity::AcceptScriptMsg(msg, uid, mgr);

src/MetroidPrime/ScriptObjects/CScriptMidi.cpp

@@ -4,8 +4,9 @@
 #include "MetroidPrime/CInGameTweakManager.hpp"
 #include "MetroidPrime/CWorld.hpp"
 
-CScriptMidi::CScriptMidi(TUniqueId id, const CEntityInfo& info, const rstl::string& name,
+CScriptMidi::CScriptMidi(const TUniqueId id, const CEntityInfo& info, const rstl::string& name,
-                         bool active, CAssetId csng, float fadeIn, float fadeOut, int volume)
+                         const bool active, const CAssetId csng, const float fadeIn,
+                         const float fadeOut, const int volume)
 : CEntity(id, info, active, name)
 , x34_song(gpSimplePool->GetObj(SObjectTag('CSNG', csng)))
 , x3c_handle()

src/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.cpp

@@ -5,10 +5,10 @@
 #include "MetroidPrime/Player/CPlayerState.hpp"
 
 CScriptPlayerStateChange::CScriptPlayerStateChange(TUniqueId uid, const rstl::string& name,
-                                                   const CEntityInfo& info, bool active,
+                                                   const CEntityInfo& info, const bool active,
-                                                   int itemType, int itemCount, int itemCapacity,
+                                                   const int itemType, const int itemCount,
-                                                   EControl control,
+                                                   const int itemCapacity, const EControl control,
-                                                   EControlCommandOption controlCmdOpt)
+                                                   const EControlCommandOption controlCmdOpt)
 : CEntity(uid, info, active, name)
 , x34_itemType(itemType)
 , x38_itemCount(itemCount)

src/MetroidPrime/ScriptObjects/CScriptRandomRelay.cpp

@@ -6,7 +6,8 @@
 
 CScriptRandomRelay::CScriptRandomRelay(TUniqueId uid, const rstl::string& name,
                                        const CEntityInfo& info, int sendSetSize,
-                                       int sendSetVariance, bool percentSize, bool active)
+                                       const int sendSetVariance, const bool percentSize,
+                                       const bool active)
 : CEntity(uid, info, active, name)
 , x34_sendSetSize(sendSetSize)
 , x38_sendSetVariance(sendSetVariance)

src/MetroidPrime/ScriptObjects/CScriptRelay.cpp

@@ -1,7 +1,7 @@
 #include "MetroidPrime/ScriptObjects/CScriptRelay.hpp"
 
 CScriptRelay::CScriptRelay(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
-                           bool active)
+                           const bool active)
 : CEntity(uid, info, active, name), x34_nextRelay(kInvalidUniqueId), x38_sendCount(0) {}
 
 void CScriptRelay::UpdateObjectRef(CStateManager& stateMgr) {
@@ -11,7 +11,7 @@ void CScriptRelay::UpdateObjectRef(CStateManager& stateMgr) {
       *tmp = x34_nextRelay;
       return;
     }
-    CScriptRelay* obj = static_cast<CScriptRelay*>(stateMgr.ObjectById(*tmp));
+    CScriptRelay* obj = static_cast< CScriptRelay* >(stateMgr.ObjectById(*tmp));
     if (obj == nullptr) {
       return;
     }

src/MetroidPrime/ScriptObjects/CScriptRipple.cpp

@@ -5,8 +5,8 @@
 #include "MetroidPrime/CStateManager.hpp"
 #include "MetroidPrime/ScriptObjects/CScriptWater.hpp"
 
-CScriptRipple::CScriptRipple(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
+CScriptRipple::CScriptRipple(const TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
-                             const CVector3f& vec, bool active, float f1)
+                             const CVector3f& vec, const bool active, const float f1)
 : CEntity(uid, info, active, name)
 , x34_magnitude(f1 >= 0.f ? f1 : CRipple::kDefaultScale)
 , x38_center(vec) {}

src/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.cpp

@@ -5,13 +5,15 @@
 static TAreaId s_ActiveAcousticsAreaId = kInvalidAreaId;
 
 CScriptRoomAcoustics::CScriptRoomAcoustics(
-    TUniqueId uid, const rstl::string& name, const CEntityInfo& info, bool active, uint volScale,
+    TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const bool active,
-    bool revHi, bool revHiDis, float revHiTime, float revHiPreDelay, float revHiDamping,
+    const uint volScale, const bool revHi, const bool revHiDis, const float revHiTime,
-    float revHiColoration, float revHiCrosstalk, float revHiMix, bool chorus, float baseDelay,
+    const float revHiPreDelay, const float revHiDamping, const float revHiColoration,
-    float variation, float period, bool revStd, bool revStdDis, float revStdTime,
+    const float revHiCrosstalk, const float revHiMix, const bool chorus, const float baseDelay,
-    float revStdPreDelay, float revStdDamping, float revStdColoration, float revStdMix, bool delay,
+    const float variation, const float period, const bool revStd, const bool revStdDis,
-    int delayL, int delayR, int delayS, int feedbackL, int feedbackR, int feedbackS, int outputL,
+    const float revStdTime, const float revStdPreDelay, const float revStdDamping,
-    int outputR, int outputS)
+    const float revStdColoration, const float revStdMix, const bool delay, const int delayL,
+    const int delayR, const int delayS, const int feedbackL, const int feedbackR,
+    const int feedbackS, const int outputL, const int outputR, const int outputS)
 : CEntity(uid, info, active, name)
 , x34_volumeScale(volScale)
 , x38_revHi(revHi)

src/MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp

@@ -7,8 +7,8 @@
 
 CScriptSpawnPoint::CScriptSpawnPoint(
     TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf,
-    const rstl::reserved_vector< int, int(CPlayerState::kIT_Max) >& itemCounts, bool defaultSpawn,
+    const rstl::reserved_vector< int, int(CPlayerState::kIT_Max) >& itemCounts,
-    bool active, bool morphed)
+    const bool defaultSpawn, const bool active, const bool morphed)
 : CEntity(uid, info, active, name)
 , x34_xf(xf)
 , x64_itemCounts(itemCounts)

src/MetroidPrime/ScriptObjects/CScriptSwitch.cpp

@@ -1,7 +1,7 @@
 #include "MetroidPrime/ScriptObjects/CScriptSwitch.hpp"
 
 CScriptSwitch::CScriptSwitch(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
-                             bool active, bool opened, bool closeOnOpened)
+                             const bool active, const bool opened, const bool closeOnOpened)
 : CEntity(uid, info, active, name) {
   mOpened = opened;
   mCloseOnOpened = closeOnOpened;

src/MetroidPrime/ScriptObjects/CScriptTimer.cpp

@@ -2,9 +2,9 @@
 
 #include "MetroidPrime/CStateManager.hpp"
 
-CScriptTimer::CScriptTimer(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
+CScriptTimer::CScriptTimer(const TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
-                           float startTime, float maxRandDelay, bool loop, bool autoStart,
+                           const float startTime, const float maxRandDelay, const bool loop,
-                           bool active)
+                           const bool autoStart, const bool active)
 : CEntity(uid, info, active, name)
 , x34_time(startTime)
 , x38_startTime(startTime)
@@ -51,7 +51,6 @@ void CScriptTimer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId,
     }
     break;
 
-
   case kSM_ResetAndStart:
     if (GetActive()) {
       Reset(stateMgr);

src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp

@@ -11,9 +11,9 @@
 #include "Kyoto/Audio/CSfxManager.hpp"
 #include "Kyoto/CResFactory.hpp"
 
-CScriptWorldTeleporter::CScriptWorldTeleporter(TUniqueId uid, const rstl::string& name,
+CScriptWorldTeleporter::CScriptWorldTeleporter(const TUniqueId uid, const rstl::string& name,
-                                               const CEntityInfo& info, bool active,
+                                               const CEntityInfo& info, const bool active,
-                                               CAssetId worldId, CAssetId areaId)
+                                               const CAssetId worldId, const CAssetId areaId)
 : CEntity(uid, info, active, name)
 , x34_worldId(worldId)
 , x38_areaId(areaId)
@@ -35,11 +35,11 @@ CScriptWorldTeleporter::CScriptWorldTeleporter(TUniqueId uid, const rstl::string
 , x8b_panning(0) {}
 
 CScriptWorldTeleporter::CScriptWorldTeleporter(
-    TUniqueId uid, const rstl::string& name, const CEntityInfo& info, bool active, CAssetId worldId,
+    const TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const bool active,
-    CAssetId areaId, CAssetId playerAncs, uint charIdx, uint defaultAnim,
+    CAssetId worldId, const CAssetId areaId, CAssetId playerAncs, uint charIdx, uint defaultAnim,
-    const CVector3f& playerScale, CAssetId platformModel, const CVector3f& platformScale,
+    const CVector3f& playerScale, const CAssetId platformModel, const CVector3f& platformScale,
-    CAssetId backgroundModel, const CVector3f& backgroundScale, bool upElevator, ushort soundId,
+    const CAssetId backgroundModel, const CVector3f& backgroundScale, const bool upElevator,
-    uchar volume, uchar panning)
+    const ushort soundId, const uchar volume, const uchar panning)
 : CEntity(uid, info, active, name)
 , x34_worldId(worldId)
 , x38_areaId(areaId)
@@ -60,12 +60,11 @@ CScriptWorldTeleporter::CScriptWorldTeleporter(
 , x8a_volume(volume)
 , x8b_panning(panning) {}
 
-CScriptWorldTeleporter::CScriptWorldTeleporter(TUniqueId uid, const rstl::string& name,
+CScriptWorldTeleporter::CScriptWorldTeleporter(
-                                               const CEntityInfo& info, bool active,
+    const TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const bool active,
-                                               CAssetId worldId, CAssetId areaId, int soundId,
+    const CAssetId worldId, const CAssetId areaId, const int soundId, const uchar volume,
-                                               uchar volume, uchar panning, CAssetId fontId,
+    const uchar panning, CAssetId fontId, const CAssetId stringId, const bool fadeWhite,
-                                               CAssetId stringId, bool fadeWhite, float charFadeIn,
+    const float charFadeIn, const float charsPerSecond, const float showDelay)
-                                               float charsPerSecond, float showDelay)
 : CEntity(uid, info, active, name)
 , x34_worldId(worldId)
 , x38_areaId(areaId)