AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-03 03:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

CDependencyGroupLoader: Make use of unsigned stream helpers

Browse Source 
Eliminates implicit sign conversions
This commit is contained in:
Lioncash 2020-06-19 02:35:18 -04:00
parent 3dd325f708
commit 0ec31eef71
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Core/Resource/Factory/CDependencyGroupLoader.cpp
View File

@ -4,9 +4,9 @@
EGame CDependencyGroupLoader::VersionTest(IInputStream& rDGRP, uint32 DepCount) EGame CDependencyGroupLoader::VersionTest(IInputStream& rDGRP, uint32 DepCount)
{ {
// Only difference between versions is asset ID length. Just check for EOF with 32-bit ID length. // Only difference between versions is asset ID length. Just check for EOF with 32-bit ID length.
uint32 Start = rDGRP.Tell(); const uint32 Start = rDGRP.Tell();
rDGRP.Seek(DepCount * 8, SEEK_CUR); rDGRP.Seek(DepCount * 8, SEEK_CUR);
uint32 Remaining = rDGRP.Size() - rDGRP.Tell(); const uint32 Remaining = rDGRP.Size() - rDGRP.Tell();
EGame Game = EGame::CorruptionProto; EGame Game = EGame::CorruptionProto;
@ -16,7 +16,7 @@ EGame CDependencyGroupLoader::VersionTest(IInputStream& rDGRP, uint32 DepCount)
for (uint32 iRem = 0; iRem < Remaining; iRem++) for (uint32 iRem = 0; iRem < Remaining; iRem++)
{ {
uint8 Byte = rDGRP.ReadByte(); const uint8 Byte = rDGRP.ReadUByte();
if (Byte != 0xFF) if (Byte != 0xFF)
{ {
@ -25,7 +25,8 @@ EGame CDependencyGroupLoader::VersionTest(IInputStream& rDGRP, uint32 DepCount)
} }
} }
if (IsEOF) Game = EGame::PrimeDemo; if (IsEOF)
Game = EGame::PrimeDemo;
} }
rDGRP.Seek(Start, SEEK_SET); rDGRP.Seek(Start, SEEK_SET);
@ -37,15 +38,15 @@ std::unique_ptr<CDependencyGroup> CDependencyGroupLoader::LoadDGRP(IInputStream&
if (!rDGRP.IsValid()) if (!rDGRP.IsValid())
return nullptr; return nullptr;
uint32 NumDependencies = rDGRP.ReadLong(); const uint32 NumDependencies = rDGRP.ReadULong();
EGame Game = VersionTest(rDGRP, NumDependencies); const EGame Game = VersionTest(rDGRP, NumDependencies);
auto pGroup = std::make_unique<CDependencyGroup>(pEntry); auto pGroup = std::make_unique<CDependencyGroup>(pEntry);
for (uint32 iDep = 0; iDep < NumDependencies; iDep++) for (uint32 iDep = 0; iDep < NumDependencies; iDep++)
{ {
rDGRP.Seek(0x4, SEEK_CUR); // Skip dependency type rDGRP.Seek(0x4, SEEK_CUR); // Skip dependency type
CAssetID AssetID(rDGRP, Game); const CAssetID AssetID(rDGRP, Game);
pGroup->AddDependency(AssetID); pGroup->AddDependency(AssetID);
} }