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

Renaming & more CActor progress

Browse Source 
Former-commit-id: bcfefcc34a
This commit is contained in:
Luke Street
2022-08-15 22:14:28 -04:00
parent 9675db47b4
commit f3e607a3af
82 changed files with 1579 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/MetroidPrime/CStateManager.hpp
View File

@@ -8,19 +8,27 @@
#include "rstl/auto_ptr.hpp"
#include "rstl/list.hpp"
#include "rstl/rc_ptr.hpp"
#include "rstl/reserved_vector.hpp"
#include "rstl/single_ptr.hpp"
class CAABox;
class CActor;
class CActorModelParticles;
class CCameraManager;
class CEnvFxManager;
class CFluidPlaneManager;
class CMapWorldInfo;
class CObjectList;
class CPlayer;
class CPlayerState;
class CRumbleManager;
class CScriptMailbox;
class CStateManagerContainer;
class CVector3f;
class CWeaponMgr;
class CWorld;
class CWorldTransManager;
namespace SL {
class CSortedListManager;
@@ -29,8 +37,14 @@ class CSortedListManager;
class CStateManager {
public:
void SendScriptMsg(TUniqueId uid, TEditorId target, EScriptObjectMessage msg, EScriptObjectState state);
bool AddDrawableActor(const CActor& actor, const CVector3f& pos, const CAABox& bounds) const;
CCameraManager& GetCameraManager() { return *x870_cameraManager; }
CCameraManager* CameraManager() { return x870_cameraManager; }
const CCameraManager* GetCameraManager() const { return x870_cameraManager; }
CPlayerState* PlayerState() { return x8b8_playerState.GetPtr(); }
const CPlayerState* GetPlayerState() const { return x8b8_playerState.GetPtr(); }
CWorld* World() { return x850_world.get(); }
const CWorld* GetWorld() const { return x850_world.get(); }
private:
u16 x0_nextFreeIndex;
@@ -47,6 +61,14 @@ private:
CEnvFxManager* x880_envFxManager;
rstl::auto_ptr< CActorModelParticles > x884_actorModelParticles;
CRumbleManager* x88c_rumbleManager;
// TODO
// rstl::multimap< TEditorId, TUniqueId > x890_scriptIdMap;
// rstl::map< TEditorId, SScriptObjectStream > x8a4_loadedScriptObjects;
u8 pad[0x28];
rstl::rc_ptr< CPlayerState > x8b8_playerState;
rstl::rc_ptr< CScriptMailbox > x8bc_mailbox;
rstl::rc_ptr< CMapWorldInfo > x8c0_mapWorldInfo;
rstl::rc_ptr< CWorldTransManager > x8c4_worldTransManager;
};
#endif