2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 01:47:42 +00:00

Reformat pass

This commit is contained in:
2021-06-07 12:29:18 -07:00
parent d7559823ea
commit a9bcb7a9ce
424 changed files with 4377 additions and 4790 deletions

View File

@@ -19,7 +19,8 @@ class CResLoader {
// std::list<std::unique_ptr<CPakFile>> x0_aramList;
std::list<std::unique_ptr<CPakFile>> x18_pakLoadedList;
std::list<std::unique_ptr<CPakFile>> x30_pakLoadingList;
std::list<std::unique_ptr<CPakFile>> m_overridePakList; // URDE Addition, Trilogy has a similar mechanism, need to verify behavior against it
std::list<std::unique_ptr<CPakFile>>
m_overridePakList; // URDE Addition, Trilogy has a similar mechanism, need to verify behavior against it
u32 x44_pakLoadingCount = 0;
std::list<std::unique_ptr<CPakFile>>::iterator x48_curPak;
mutable CAssetId x4c_cachedResId;
@@ -28,11 +29,12 @@ class CResLoader {
bool _GetTagListForFile(std::vector<SObjectTag>& out, const std::string& path,
const std::unique_ptr<CPakFile>& file) const;
public:
CResLoader();
const std::vector<CAssetId>* GetTagListForFile(std::string_view name) const;
void AddPakFileAsync(std::string_view name, bool buildDepList, bool worldPak, bool override=false);
void AddPakFile(std::string_view name, bool samusPak, bool worldPak, bool override=false);
void AddPakFileAsync(std::string_view name, bool buildDepList, bool worldPak, bool override = false);
void AddPakFile(std::string_view name, bool samusPak, bool worldPak, bool override = false);
void WaitForPakFileLoadingComplete();
std::unique_ptr<CInputStream> LoadNewResourcePartSync(const SObjectTag& tag, u32 length, u32 offset, void* extBuf);
void LoadMemResourceSync(const SObjectTag& tag, std::unique_ptr<u8[]>& bufOut, int* sizeOut);