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

Attempt 4 to fix ScriptLayerController for Tom

Browse Source
This commit is contained in:
Phillip Stephens
2020-10-21 15:55:45 -07:00
parent 528c96b2c0
commit b963ce1e85
9 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/World/CGameArea.hpp
View File

@@ -47,7 +47,7 @@ class CDummyGameArea final : public IGameArea {
int x4_mlvlVersion;
CAssetId x8_nameSTRG;
CAssetId xc_mrea;
CAssetId x10_areaId;
s32 x10_areaId;
zeus::CTransform x14_transform;
std::vector<u16> x44_attachedAreaIndices;
std::vector<Dock> x54_docks;
@@ -56,7 +56,7 @@ public:
CDummyGameArea(CInputStream& in, int idx, int mlvlVersion);
std::pair<std::unique_ptr<u8[]>, s32> IGetScriptingMemoryAlways() const override;
CAssetId IGetAreaId() const override;
s32 IGetAreaSaveId() const override;
CAssetId IGetAreaAssetId() const override;
bool IIsActive() const override;
TAreaId IGetAttachedAreaId(int) const override;
@@ -104,7 +104,7 @@ class CGameArea final : public IGameArea {
zeus::CTransform x3c_invTransform;
zeus::CAABox x6c_aabb;
CAssetId x84_mrea;
CAssetId x88_areaId;
s32 x88_areaId;
std::vector<u16> x8c_attachedAreaIndices;
std::vector<SObjectTag> x9c_deps1;
std::vector<SObjectTag> xac_deps2;
@@ -278,8 +278,8 @@ public:
void SetLoadPauseState(bool paused);
std::pair<std::unique_ptr<u8[]>, s32> IGetScriptingMemoryAlways() const override;
TAreaId GetAreaIndex() const { return x4_selfIdx; }
CAssetId IGetAreaId() const override { return x88_areaId; }
TAreaId GetAreaId() const { return x4_selfIdx; }
s32 IGetAreaSaveId() const override { return x88_areaId; }
CAssetId IGetAreaAssetId() const override { return x84_mrea; }
bool IIsActive() const override;
TAreaId IGetAttachedAreaId(int) const override;