AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CScanLoader: Make use of unsigned stream helpers

This commit is contained in:
Lioncash 2020-06-19 03:41:41 -04:00
parent 125da2d930
commit ffbe857c2c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/Resource/Factory/CScanLoader.cpp
View File

@ -6,7 +6,7 @@
std::unique_ptr<CScan> CScanLoader::LoadScanMP1(IInputStream& SCAN, CResourceEntry* pEntry) std::unique_ptr<CScan> CScanLoader::LoadScanMP1(IInputStream& SCAN, CResourceEntry* pEntry)
{ {
// Validate magic // Validate magic
uint Magic = SCAN.ReadLong(); const uint32 Magic = SCAN.ReadULong();
if (Magic != 0x0BADBEEF) if (Magic != 0x0BADBEEF)
{ {
@ -31,7 +31,7 @@ std::unique_ptr<CScan> CScanLoader::LoadScanMP1(IInputStream& SCAN, CResourceEnt
std::unique_ptr<CScan> CScanLoader::LoadScanMP2(IInputStream& SCAN, CResourceEntry* pEntry) std::unique_ptr<CScan> CScanLoader::LoadScanMP2(IInputStream& SCAN, CResourceEntry* pEntry)
{ {
// Validate version // Validate version
uint Version = SCAN.ReadLong(); const uint32 Version = SCAN.ReadULong();
if (Version != 2) if (Version != 2)
{ {
@ -53,12 +53,13 @@ std::unique_ptr<CScan> CScanLoader::LoadScanMP2(IInputStream& SCAN, CResourceEnt
// ************ STATIC/PUBLIC ************ // ************ STATIC/PUBLIC ************
std::unique_ptr<CScan> CScanLoader::LoadSCAN(IInputStream& SCAN, CResourceEntry *pEntry) std::unique_ptr<CScan> CScanLoader::LoadSCAN(IInputStream& SCAN, CResourceEntry *pEntry)
{ {
if (!SCAN.IsValid()) return nullptr; if (!SCAN.IsValid())
return nullptr;
// MP1 SCAN format starts with a version number and then follows with a magic. // MP1 SCAN format starts with a version number and then follows with a magic.
// The demo can be 1, 2, or 3, while the final build is 5. // The demo can be 1, 2, or 3, while the final build is 5.
// The MP2 SCAN format starts with a 'SCAN' magic. // The MP2 SCAN format starts with a 'SCAN' magic.
uint VersionCheck = SCAN.ReadLong(); const uint32 VersionCheck = SCAN.ReadULong();
// Echoes+ // Echoes+
if (VersionCheck == FOURCC('SCAN')) if (VersionCheck == FOURCC('SCAN'))
@ -66,8 +67,9 @@ std::unique_ptr<CScan> CScanLoader::LoadSCAN(IInputStream& SCAN, CResourceEntry
CScanLoader Loader; CScanLoader Loader;
return Loader.LoadScanMP2(SCAN, pEntry); return Loader.LoadScanMP2(SCAN, pEntry);
} }
// MP1 // MP1
else if (VersionCheck <= 5) if (VersionCheck <= 5)
{ {
if (VersionCheck == 5) if (VersionCheck == 5)
{ {
@ -76,7 +78,7 @@ std::unique_ptr<CScan> CScanLoader::LoadSCAN(IInputStream& SCAN, CResourceEntry
} }
else else
{ {
errorf("%s: Unsupported SCAN version: %d", VersionCheck); errorf("%s: Unsupported SCAN version: %u", VersionCheck);
return nullptr; return nullptr;
} }
} }