AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 11:07:44 +00:00
Code Issues Projects Releases Wiki Activity

Prelim CPlayer imps, fix race condition in CGameGlobalObjects

Browse Source
This commit is contained in:
Phillip Stephens
2016-09-25 09:45:22 -07:00
parent ae4f770ca2
commit 23b6bd350e
24 changed files with 2820 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/CStateManager.hpp
View File

@@ -158,7 +158,7 @@ class CStateManager
float xf28_thermColdScale2 = 0.f;
float xf2c_ = 1.f;
float xf30_ = 1.f;
TUniqueId xf6c_playerActor;
void UpdateThermalVisor();
public:
@@ -189,6 +189,7 @@ public:
const std::string* HashInstanceName(CInputStream& in);
void SetActorAreaId(CActor& actor, TAreaId);
void TouchSky() const;
void TouchPlayerActor();
void DrawSpaceWarp(const zeus::CVector3f&, float) const;
void DrawReflection(const zeus::CVector3f&);
void CacheReflection();
@@ -288,6 +289,7 @@ public:
bool IsLayerActive(TAreaId area, int layerIdx) { return false; }
CPlayer& GetPlayer() const { return *x84c_player; }
CPlayer* Player() const { return x84c_player.get(); }
CObjectList& GetAllObjectList() const { return *x80c_allObjs; }
CActorList& GetActorObjectList() const { return *x814_actorObjs; }