From 76b3a678527d036af873b4d87dd19b2af0474008 Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Fri, 11 Aug 2023 22:23:40 +0300 Subject: [PATCH] CScriptPickup: add `m_` prefix for members --- .../ScriptObjects/CScriptPickup.hpp | 52 +++++++------- .../ScriptObjects/CScriptPickup.cpp | 72 +++++++++---------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp b/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp index 3e8d9e7..2821aa8 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPickup.hpp @@ -10,36 +10,36 @@ class CGenDescription; class CEchoParameters; class CScriptPickup : public CActor { - CPlayerState::EItemType itemType; // x158 - int amount; - int capacity; - int percentage; - float lifeTime; - float respawnTime; + CPlayerState::EItemType m_itemType; // x158 + int m_amount; + int m_capacity; + int m_percentageIncrease; + float m_lifeTime; + float m_respawnTime; float x170; - float fadeTime; - float curTime; + float m_fadeTime; + float m_curTime; float x17c; - float timeLeftToSet; - float activateDelay; - float autoHomeRange; - float delayUntilHome; - float homingSpeed; - float transformZ; - rstl::optional_object< TCachedToken< CGenDescription > > pickupParticleDesc; - CAABox touchBounds; + float m_pickupEffectLifetime; + float m_activateDelay; + float m_autoHomeRange; + float m_delayUntilHome; + float m_homingSpeed; + float m_transformZ; + rstl::optional_object< TCachedToken< CGenDescription > > m_pickupParticleDesc; + CAABox m_touchBounds; int x1bc; int x1c0; - CVector3f orbitOffset; - bool unknownProp : 1; - bool generated : 1; // unk - bool inTractor : 1; // unk - bool absoluteValue : 1; - bool enableTractorTest : 1; // unk - bool autoSpin : 1; - bool unk2 : 1; - bool unk3 : 1; - bool blinkOut : 1; + CVector3f m_orbitOffset; + bool m_unknownProp : 1; + bool m_generated : 1; // unk + bool m_inTractor : 1; // unk + bool m_absoluteValue : 1; + bool m_enableTractorTest : 1; // unk + bool m_autoSpin : 1; + bool m_unk2 : 1; + bool m_unk3 : 1; + bool m_blinkOut : 1; public: CScriptPickup(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, diff --git a/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp b/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp index 4ee9674..328da3e 100644 --- a/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp +++ b/src/MetroidPrime/ScriptObjects/CScriptPickup.cpp @@ -32,47 +32,47 @@ static float skDrawInDistance = 30.f; CScriptPickup::CScriptPickup(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, - const CTransform4f& xf, const CModelData& mData, + const CTransform4f& xf, const CModelData& modelData, const CActorParameters& aParams, const CEchoParameters& echo, const CAABox& aabb, CPlayerState::EItemType itemType, int amount, int capacityIncrease, int itemPercentageIncrease, CAssetId pickupEffect, bool absoluteValue, bool unknown, bool autoSpin, - bool blinkOut, float lifetime, float respawnTime, float fadeTime, + bool blinkOut, float lifeTime, float respawnTime, float fadeTime, float activateDelay, float pickupEffectLifetime, float autoHomeRange, float delayUntilHome, float homingSpeed, const CVector3f& orbitOffset) -: CActor(uid, name, info, 0, xf, mData, CMaterialList(), aParams, kInvalidUniqueId) -, itemType(itemType) -, amount(amount) -, capacity(capacity) -, percentage(percentage) -, lifeTime(lifeTime) -, respawnTime(respawnTime) +: CActor(uid, name, info, 0, xf, modelData, CMaterialList(), aParams, kInvalidUniqueId) +, m_itemType(itemType) +, m_amount(amount) +, m_capacity(capacityIncrease) +, m_percentageIncrease(itemPercentageIncrease) +, m_lifeTime(lifeTime) +, m_respawnTime(respawnTime) , x170(0.f) -, fadeTime(fadeTime) -, curTime(0.0f) -, timeLeftToSet(timeLeftToSet) -, activateDelay(activateDelay) -, autoHomeRange(autoHomeRange) -, delayUntilHome(delayUntilHome) -, homingSpeed(homingSpeed) -, transformZ(xf.GetTranslation().GetZ()) -, pickupParticleDesc() -, touchBounds(aabb) +, m_fadeTime(fadeTime) +, m_curTime(0.0f) +, m_pickupEffectLifetime(pickupEffectLifetime) +, m_activateDelay(activateDelay) +, m_autoHomeRange(autoHomeRange) +, m_delayUntilHome(delayUntilHome) +, m_homingSpeed(homingSpeed) +, m_transformZ(xf.GetTranslation().GetZ()) +, m_pickupParticleDesc() +, m_touchBounds(aabb) , x1bc(0) , x1c0(0) -, orbitOffset(orbitOffset) -, unknownProp(unknown) -, generated(false) -, inTractor(false) -, absoluteValue(absoluteValue) -, enableTractorTest(false) -, autoSpin(autoSpin) -, unk2(false) -, unk3(false) -, blinkOut(blinkOut) { +, m_orbitOffset(orbitOffset) +, m_unknownProp(unknown) +, m_generated(false) +, m_inTractor(false) +, m_absoluteValue(absoluteValue) +, m_enableTractorTest(false) +, m_autoSpin(autoSpin) +, m_unk2(false) +, m_unk3(false) +, m_blinkOut(blinkOut) { if (pickupEffect != kInvalidAssetId) { - pickupParticleDesc = gpSimplePool->GetObj(SObjectTag('PART', pickupEffect)); - pickupParticleDesc->Lock(); + m_pickupParticleDesc = gpSimplePool->GetObj(SObjectTag('PART', pickupEffect)); + m_pickupParticleDesc->Lock(); } if (HasAnimation()) { @@ -128,7 +128,7 @@ void CScriptPickup::Think(float dt, CStateManager& mgr) { // SetModelFlags(drawFlags); // if (HasAnimation()) { - // CAdvancementDeltas deltas = UpdateAnimation(dt, mgr, true); + // CAdvancementDeltas deltas = UpdateAnimation(dt, m_gr, true); // MoveToOR(deltas.GetOffsetDelta(), dt); // RotateToOR(deltas.GetOrientationDelta(), dt); // } @@ -180,7 +180,7 @@ void CScriptPickup::Touch(CActor& act, CStateManager& mgr) { // if (x27c_pickupParticleDesc) { // if (mgr.GetPlayerState()->GetActiveVisor(mgr) != CPlayerState::kPV_Thermal) { // mgr.AddObject(new CExplosion( - // TLockedToken< CGenDescription >(*x27c_pickupParticleDesc), mgr.AllocateUniqueId(), + // TLockedToken< CGenDescription >(*x27c_pickupParticleDesc), m_gr.AllocateUniqueId(), // true, CEntityInfo(GetCurrentAreaId(), CEntity::NullConnectionList, kInvalidEditorId), // rstl::string_l("Explosion - Pickup Effect"), GetTransform(), 0, // CVector3f(1.f, 1.f, 1.f), CColor::White())); @@ -191,7 +191,7 @@ void CScriptPickup::Touch(CActor& act, CStateManager& mgr) { // mgr.PlayerState()->InitializePowerUp(itemType, x260_capacity); // mgr.PlayerState()->IncrPickUp(itemType, x25c_amount); // mgr.FreeScriptObject(GetUniqueId()); - // SendScriptMsgs(kSS_Arrived, mgr, kSM_None); + // SendScriptMsgs(kSS_Arrived, m_gr, kSM_None); // if (x260_capacity > 0) { // const CPlayerState* playerState = mgr.GetPlayerState(); @@ -236,9 +236,9 @@ void CScriptPickup::AddToRenderer(const CFrustumPlanes& a, const CStateManager& } } -CPlayerState::EItemType CScriptPickup::GetItem() const { return itemType; } +CPlayerState::EItemType CScriptPickup::GetItem() const { return m_itemType; } -void CScriptPickup::SetSpawned() { generated = true; } +void CScriptPickup::SetSpawned() { m_generated = true; } CAABox LoadCAABox(CStateManager& mgr, const TAreaId& areaId, const CVector3f& collisionSize, const CVector3f& collisionOffset);