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

Start matching CScriptPlatform; more CScriptMazeNode

Browse Source 
Former-commit-id: 135d63412c
This commit is contained in:
Luke Street
2022-09-18 01:55:13 -04:00
parent ad6fd10f21
commit 41a2efa884
30 changed files with 984 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/MetroidPrime/CStateManager.hpp
View File

@@ -3,7 +3,9 @@
#include "types.h"
#include "Kyoto/CRandom16.hpp"
#include "MetroidPrime/CEntityInfo.hpp"
#include "MetroidPrime/CObjectList.hpp"
#include "MetroidPrime/TGameTypes.hpp"
#include "rstl/auto_ptr.hpp"
@@ -31,6 +33,7 @@ class CWeaponMgr;
class CWorld;
class CWorldTransManager;
class CEntity;
class CMazeState;
namespace SL {
class CSortedListManager;
@@ -49,6 +52,10 @@ public:
const CEntity* GetObjectById(TUniqueId uid) const;
TUniqueId GetIdForScript(TEditorId eid) const;
CMazeState* CurrentMaze();
const CMazeState* GetCurrentMaze() const;
void SetCurrentMaze(const rstl::single_ptr<CMazeState>& maze);
CCameraManager* CameraManager() { return x870_cameraManager; }
const CCameraManager* GetCameraManager() const { return x870_cameraManager; }
CPlayerState* PlayerState() { return x8b8_playerState.GetPtr(); }
@@ -57,6 +64,9 @@ public:
const CWorld* GetWorld() const { return x850_world.get(); }
CActorModelParticles* ActorModelParticles() { return x884_actorModelParticles.get(); }
const CActorModelParticles* GetActorModelParticles() const { return x884_actorModelParticles.get(); }
CRandom16* GetActiveRandom() const { return x900_random; }
CObjectList& GetObjectListById(EGameObjectList id) { return *x808_objectLists[id]; }
f32 GetThermalColdScale1() const { return xf24_thermColdScale1; }
f32 GetThermalColdScale2() const { return xf28_thermColdScale2; }
@@ -64,6 +74,14 @@ public:
bool IsGeneratingObject() const { return xf94_26_generatingObject; }
void SetIsGeneratingObject(bool gen) { xf94_26_generatingObject = gen; }
inline TUniqueId GenerateObjectInline(TEditorId eid) {
bool wasGeneratingObject = IsGeneratingObject();
SetIsGeneratingObject(true);
TUniqueId objUid = GenerateObject(eid).second;
SetIsGeneratingObject(wasGeneratingObject);
return objUid;
}
private:
u16 x0_nextFreeIndex;
rstl::reserved_vector< u16, 1024 > x8_objectIndexArray;
@@ -87,7 +105,9 @@ private:
rstl::rc_ptr< CScriptMailbox > x8bc_mailbox;
rstl::rc_ptr< CMapWorldInfo > x8c0_mapWorldInfo;
rstl::rc_ptr< CWorldTransManager > x8c4_worldTransManager;
u8 pad2[0x658];
u8 pad2[0x38];
CRandom16* x900_random;
u8 pad4[0x61c];
f32 xf24_thermColdScale1;
f32 xf28_thermColdScale2;
u8 pad3[0x6c];