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

Additional CWorld discoveries; CAudioGroupSet imp

Browse Source
This commit is contained in:
Jack Andersen
2016-07-24 12:51:15 -10:00
parent 4b10697a5a
commit 4fd2c0e377
7 changed files with 161 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Runtime/World/CWorld.hpp
View File

@@ -13,6 +13,7 @@ class IObjectStore;
class CResFactory;
class CMapWorld;
class IGameArea;
class CAudioGroupSet;
class IWorld
{
@@ -87,8 +88,12 @@ public:
static std::vector<CWorld::CRelay> ReadMemoryRelays(athena::io::MemoryReader& r);
};
class CSoundGroupData
struct CSoundGroupData
{
int x0_groupId;
ResId x4_agscId;
std::string xc_name;
TCachedToken<CAudioGroupSet> x1c_groupData;
public:
CSoundGroupData(int grpId, ResId agsc);
};
@@ -100,8 +105,8 @@ private:
Loading,
LoadingMap,
LoadingMapAreas,
LoadingSkyBox,
LoadingSoundGroups,
Done,
} x4_phase = Phase::Loading;
ResId x8_mlvlId = -1;
@@ -131,10 +136,15 @@ private:
bool x70_26_ : 1;
bool x70_27_ : 1;
};
u16 dummy = 0;
};
std::vector<CSoundGroupData> x74_soundGroupData;
std::string x84_defAudioTrack;
TLockedToken<CModel> x84_skybox;
TLockedToken<CModel> x94_skybox;
TLockedToken<CModel> xa4_skyboxB;
void LoadSoundGroup(int groupId, ResId agscId, CSoundGroupData& data);
void LoadSoundGroups();
public: