From 709fcf18ae4bdfc1d706972dc84b3ef1645aee4e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 18 Jun 2020 07:54:15 -0400
Subject: [PATCH] CPackage: Make use of size_t where applicable

Plays nicer with std containers.
---
 src/Core/GameProject/CGameProject.cpp           |  4 ++--
 src/Core/GameProject/CPackage.h                 |  4 ++--
 src/Core/GameProject/DependencyListBuilders.cpp | 14 ++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Core/GameProject/CGameProject.cpp b/src/Core/GameProject/CGameProject.cpp
index afe87f23..da1d9be5 100644
--- a/src/Core/GameProject/CGameProject.cpp
+++ b/src/Core/GameProject/CGameProject.cpp
@@ -128,7 +128,7 @@ void CGameProject::GetWorldList(std::list<CAssetID>& rOut) const
         // Construct a sorted list of worlds in this package
         std::list<const SNamedResource*> PackageWorlds;
 
-        for (uint32 iRes = 0; iRes < pPkg->NumNamedResources(); iRes++)
+        for (size_t iRes = 0; iRes < pPkg->NumNamedResources(); iRes++)
         {
             const SNamedResource& rkRes = pPkg->NamedResourceByIndex(iRes);
 
@@ -152,7 +152,7 @@ CAssetID CGameProject::FindNamedResource(std::string_view name) const
 {
     for (const auto& pkg : mPackages)
     {
-        for (uint32 iRes = 0; iRes < pkg->NumNamedResources(); iRes++)
+        for (size_t iRes = 0; iRes < pkg->NumNamedResources(); iRes++)
         {
             const SNamedResource& rkRes = pkg->NamedResourceByIndex(iRes);
 
diff --git a/src/Core/GameProject/CPackage.h b/src/Core/GameProject/CPackage.h
index 4d0407ce..e17742e5 100644
--- a/src/Core/GameProject/CPackage.h
+++ b/src/Core/GameProject/CPackage.h
@@ -71,8 +71,8 @@ public:
     TString Name() const                                         { return mPakName; }
     TString Path() const                                         { return mPakPath; }
     CGameProject* Project() const                                { return mpProject; }
-    uint32 NumNamedResources() const                             { return mResources.size(); }
-    const SNamedResource& NamedResourceByIndex(uint32 Idx) const { return mResources[Idx]; }
+    size_t NumNamedResources() const                             { return mResources.size(); }
+    const SNamedResource& NamedResourceByIndex(size_t Idx) const { return mResources[Idx]; }
     bool NeedsRecook() const                                     { return mNeedsRecook; }
 
     void SetPakName(TString NewName) { mPakName = std::move(NewName); }
diff --git a/src/Core/GameProject/DependencyListBuilders.cpp b/src/Core/GameProject/DependencyListBuilders.cpp
index 04754417..0ec20bb1 100644
--- a/src/Core/GameProject/DependencyListBuilders.cpp
+++ b/src/Core/GameProject/DependencyListBuilders.cpp
@@ -184,11 +184,12 @@ void CPackageDependencyListBuilder::BuildDependencyList(bool AllowDuplicates, st
     FindUniversalAreaAssets();
 
     // Iterate over all resources and parse their dependencies
-    for (uint32 iRes = 0; iRes < mpkPackage->NumNamedResources(); iRes++)
+    for (size_t iRes = 0; iRes < mpkPackage->NumNamedResources(); iRes++)
     {
         const SNamedResource& rkRes = mpkPackage->NamedResourceByIndex(iRes);
         CResourceEntry *pEntry = mpStore->FindEntry(rkRes.ID);
-        if (!pEntry) continue;
+        if (!pEntry)
+            continue;
 
         if (rkRes.Name.EndsWith("NODEPEND") || rkRes.Type == "CSNG")
         {
@@ -196,16 +197,17 @@ void CPackageDependencyListBuilder::BuildDependencyList(bool AllowDuplicates, st
             continue;
         }
 
-        mIsUniversalAreaAsset = (mUniversalAreaAssets.find(rkRes.ID) != mUniversalAreaAssets.end());
+        mIsUniversalAreaAsset = mUniversalAreaAssets.find(rkRes.ID) != mUniversalAreaAssets.cend();
 
         if (rkRes.Type == "MLVL")
         {
-            mpWorld = (CWorld*) pEntry->Load();
+            mpWorld = static_cast<CWorld*>(pEntry->Load());
             ASSERT(mpWorld);
         }
-
         else
+        {
             mCharacterUsageMap.FindUsagesForAsset(pEntry);
+        }
 
         AddDependency(nullptr, rkRes.ID, rOut);
         mpWorld = nullptr;
@@ -342,7 +344,7 @@ void CPackageDependencyListBuilder::FindUniversalAreaAssets()
     if (pPackage)
     {
         // Iterate over all the package contents, keep track of all universal area assets
-        for (uint32 ResIdx = 0; ResIdx < pPackage->NumNamedResources(); ResIdx++)
+        for (size_t ResIdx = 0; ResIdx < pPackage->NumNamedResources(); ResIdx++)
         {
             const SNamedResource& rkRes = pPackage->NamedResourceByIndex(ResIdx);