PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-08 16:24:53 +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

5
include/MetroidPrime/CEntity.hpp
View File

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

10
include/MetroidPrime/CGameArea.hpp
View File

@@ -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 { return CChainIterator::operator==(other); }
bool operator!=(const CConstChainIterator& other) const {
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();

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

4
src/MetroidPrime/ScriptObjects/CScriptActorRotate.cpp
View File

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

8
src/MetroidPrime/ScriptObjects/CScriptAreaAttributes.cpp
View File

@@ -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() {}

10
src/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.cpp
View File

@@ -4,9 +4,10 @@
CScriptCameraBlurKeyframe::CScriptCameraBlurKeyframe(TUniqueId uid, const rstl::string& name,
const CEntityInfo& info,
CCameraBlurPass::EBlurType type, float amount,
u32 unk, float timeIn, float timeOut,
bool active)
const CCameraBlurPass::EBlurType type,
const float amount, const u32 unk,
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:

3
src/MetroidPrime/ScriptObjects/CScriptCameraShaker.cpp
View File

@@ -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) {}

11
src/MetroidPrime/ScriptObjects/CScriptControllerAction.cpp
View File

@@ -3,10 +3,10 @@
#include "MetroidPrime/CStateManager.hpp"
CScriptControllerAction::CScriptControllerAction(TUniqueId uid, const rstl::string& name,
const CEntityInfo& info, bool active,
ECommands command,
bool mapScreenResponse, uint w1,
bool deactivateOnClose)
const CEntityInfo& info, const bool active,
const ECommands command,
const bool mapScreenResponse, const uint w1,
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
CScriptControllerAction::GetCommand(CScriptControllerAction::ECommands c) {
ControlMapper::ECommands CScriptControllerAction::GetCommand(CScriptControllerAction::ECommands c) {
return (ControlMapper::ECommands)(c);
}

5
src/MetroidPrime/ScriptObjects/CScriptCounter.cpp
View File

@@ -1,7 +1,8 @@
#include "MetroidPrime/ScriptObjects/CScriptCounter.hpp"
CScriptCounter::CScriptCounter(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
int initial, int max, bool autoReset, bool active)
CScriptCounter::CScriptCounter(const TUniqueId uid, const rstl::string& name,
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)

11
src/MetroidPrime/ScriptObjects/CScriptHUDMemo.cpp
View File

@@ -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,
CAssetId msg, bool active)
const CHUDMemoParms& parms, const EDisplayType disp, CAssetId msg,
const bool active)
: CEntity(uid, info, active, name)
, x34_parms(parms)
, x3c_dispType(disp)
@@ -17,13 +17,12 @@ CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, const rstl::string& name, const CE
CScriptHUDMemo::~CScriptHUDMemo() {}
void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
CStateManager& mgr) {
void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
switch (msg) {
case kSM_SetToZero:
if (GetActive()) {
if (x3c_dispType == kDT_MessageBox) {
mgr.ShowPausedHUDMemo(x40_stringTableId, x34_parms.GetDisplayTime());
mgr.ShowPausedHUDMemo(x40_stringTableId, x34_parms.GetDisplayTime());
} else {
if (x44_stringTable) {
CSamusHud::DisplayHudMemo((*x44_stringTable)->GetString(0), x34_parms);
@@ -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);

5
src/MetroidPrime/ScriptObjects/CScriptMidi.cpp
View File

@@ -4,8 +4,9 @@
#include "MetroidPrime/CInGameTweakManager.hpp"
#include "MetroidPrime/CWorld.hpp"
CScriptMidi::CScriptMidi(TUniqueId id, const CEntityInfo& info, const rstl::string& name,
bool active, CAssetId csng, float fadeIn, float fadeOut, int volume)
CScriptMidi::CScriptMidi(const TUniqueId id, const CEntityInfo& info, const rstl::string& name,
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()

8
src/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.cpp
View File

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

3
src/MetroidPrime/ScriptObjects/CScriptRandomRelay.cpp
View File

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

4
src/MetroidPrime/ScriptObjects/CScriptRelay.cpp
View File

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

4
src/MetroidPrime/ScriptObjects/CScriptRipple.cpp
View File

@@ -5,8 +5,8 @@
#include "MetroidPrime/CStateManager.hpp"
#include "MetroidPrime/ScriptObjects/CScriptWater.hpp"
CScriptRipple::CScriptRipple(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
const CVector3f& vec, bool active, float f1)
CScriptRipple::CScriptRipple(const TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
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) {}

16
src/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.cpp
View File

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

8
src/MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp
View File

@@ -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,
bool active, bool morphed)
const rstl::reserved_vector< int, int(CPlayerState::kIT_Max) >& itemCounts,
const bool defaultSpawn, const bool active, const bool morphed)
: CEntity(uid, info, active, name)
, x34_xf(xf)
, x64_itemCounts(itemCounts)
@@ -75,8 +75,8 @@ void CScriptSpawnPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objI
}
CEntity::SendScriptMsgs(kSS_Zero, stateMgr, kSM_None);
}
default:
break;
default:
break;
}
}

2
src/MetroidPrime/ScriptObjects/CScriptSwitch.cpp
View File

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

9
src/MetroidPrime/ScriptObjects/CScriptTimer.cpp
View File

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

27
src/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.cpp
View File

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