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

Massive fmtlib refactor

Browse Source
This commit is contained in:
Jack Andersen
2019-07-19 18:27:21 -10:00
parent e38a3ece89
commit 7a3da1f7a6
228 changed files with 2071 additions and 2116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/World/CGameArea.cpp
View File

@@ -251,7 +251,7 @@ std::pair<std::unique_ptr<u8[]>, s32> GetScriptingMemoryAlways(const IGameArea&
CMemoryInStream r(data.get() + 4, 96 - 4);
u32 version = r.readUint32Big();
if (!(version & 0x10000))
Log.report(logvisor::Fatal, "Attempted to load non-URDE MREA");
Log.report(logvisor::Fatal, fmt("Attempted to load non-URDE MREA"));
version &= ~0x10000;
header.version = (version >= 12 && version <= 15) ? version : 0;
@@ -1005,8 +1005,9 @@ void CGameArea::PostConstructArea() {
/* Resolve layer pointers */
if (x12c_postConstructed->x10c8_sclyBuf) {
athena::io::MemoryReader r(x12c_postConstructed->x10c8_sclyBuf, x12c_postConstructed->x10d0_sclySize);
u32 magic = r.readUint32Big();
if (magic == 'SCLY') {
hecl::DNAFourCC magic;
magic.read(r);
if (magic == FOURCC('SCLY')) {
r.readUint32Big();
u32 layerCount = r.readUint32Big();
x12c_postConstructed->x110c_layerPtrs.resize(layerCount);
@@ -1143,7 +1144,7 @@ SMREAHeader CGameArea::VerifyHeader() const {
CMemoryInStream r(x110_mreaSecBufs[0].first.get() + 4, x110_mreaSecBufs[0].second - 4);
u32 version = r.readUint32Big();
if (!(version & 0x10000))
Log.report(logvisor::Fatal, "Attempted to load non-URDE MREA");
Log.report(logvisor::Fatal, fmt("Attempted to load non-URDE MREA"));
version &= ~0x10000;
header.version = (version >= 12 && version <= 15) ? version : 0;
if (!header.version)