Type Clarity

- Replace a couple "auto" types with their names for clarity (especially when making a copy)
- More const
- Some more references when we don't need a separate copy

Author: SuperDude88

logic/Fill.cpp

@@ -42,7 +42,7 @@ static FillError fastFill(ItemPool& items, LocationPool& locations)
 
     while (!items.empty() && !locations.empty())
     {
-        auto item = popRandomElement(items);
+        Item item = popRandomElement(items);
         auto location = popRandomElement(locations);
         location->currentItem = item;
         LOG_TO_DEBUG("Placed " + item.getName() + " at " + location->getName() + " in world " + std::to_string(location->world->getWorldId() + 1));
@@ -294,9 +294,9 @@ void placeVanillaItems(WorldPool& worlds)
         // Place vanilla items depending on settings and remove placed vanilla items from the item pool
         for (auto location : world.getLocations())
         {
-            const auto vanillaItem = location->originalItem;
-            const auto& vanillaItemName = vanillaItem.getName();
-            const auto locationName = location->getName();
+            const Item& vanillaItem = location->originalItem;
+            const std::string& vanillaItemName = vanillaItem.getName();
+            const std::string& locationName = location->getName();
 
             if ((settings.dungeon_small_keys     == PlacementOption::Vanilla &&  vanillaItem.isSmallKey()) ||
                 (settings.dungeon_big_keys       == PlacementOption::Vanilla &&  vanillaItem.isBigKey())   ||

logic/Hints.cpp

@@ -56,7 +56,7 @@ static HintError calculatePossiblePathLocations(WorldPool& worlds)
     {
         for (auto& potentialPathLocation : world.getLocations(true))
         {
-            auto itemAtLocation = potentialPathLocation->currentItem;
+            const Item itemAtLocation = potentialPathLocation->currentItem;
             if (itemAtLocation.isJunkItem())
             {
                 continue;
@@ -143,7 +143,7 @@ static HintError calculatePossibleBarrenRegions(WorldPool& worlds)
                 // For the purposes of barren hints, if a major item cannot possibly lead to any
                 // required items, then it will not block the region it's in from being considered
                 // barren.
-                auto chainLocations = location->currentItem.getChainLocations();
+                const auto& chainLocations = location->currentItem.getChainLocations();
                 if (!chainLocations.empty())
                 {
                     // If all of this item's chain locations' are barren as chain locations, then this item is barren too.
@@ -199,8 +199,8 @@ static HintError calculatePossibleBarrenRegions(WorldPool& worlds)
                 for (auto& locAccess : location->accessPoints)
                 {
                     auto area = locAccess->area;
-                    auto generalHintRegions = area->findHintRegions(/*onlyNonIslands = */true);
-                    auto islands = area->findIslands();
+                    const auto& generalHintRegions = area->findHintRegions(/*onlyNonIslands = */true);
+                    const auto& islands = area->findIslands();
                     for (auto hintRegions : {generalHintRegions, islands})
                     {
                         for (auto& hintRegion : hintRegions)
@@ -351,8 +351,7 @@ static HintError generatePathHintLocations(World& world, std::list<Hint>& hints)
 
         // Filter out known vanilla items, and expected items, and triforce shards if Ho Ho is hinting them
         filterAndEraseFromPool(possiblePathLocations, [settings = world.getSettings()](auto location){
-            auto& item = location->currentItem;
-            return (location->hasKnownVanillaItem || location->hasExpectedItem || (settings.ho_ho_triforce_hints && item.isTriforceShard()));
+            return (location->hasKnownVanillaItem || location->hasExpectedItem || (settings.ho_ho_triforce_hints && location->currentItem.isTriforceShard()));
         });
 
         auto hintLocation = getHintableLocation(possiblePathLocations);
@@ -721,7 +720,7 @@ static HintError assignHoHoHints(World& world, WorldPool& worlds, std::list<Hint
             auto location = hint.location;
             // Remove this item from the world and see which Ho Ho are available
             // to be hinted at
-            auto itemAtLocation = location->currentItem;
+            const Item itemAtLocation = location->currentItem;
             location->currentItem = Item(GameItem::INVALID, &world);
 
             // Find all accessible locations without the item

logic/Location.cpp

@@ -192,7 +192,7 @@ bool Location::isBarrenAsChainLocation() const
 
 std::u16string Location::generateImportanceText(const std::string& language)
 {
-    auto& item = currentItem;
+    const Item& item = currentItem;
 
     std::u16string required = u"required";
     std::u16string possiblyRequired = u"possibly required";
@@ -230,7 +230,7 @@ std::u16string Location::generateImportanceText(const std::string& language)
     }
 
     // If this item is on the path to Ganondorf, then it is required
-    auto& requiredLocations = world->locationTable["Ganon's Tower - Defeat Ganondorf"]->pathLocations;
+    const auto& requiredLocations = world->locationTable["Ganon's Tower - Defeat Ganondorf"]->pathLocations;
     if (elementInPool(this, requiredLocations))
     {
         return u" (" + TEXT_COLOR_GREEN + required + TEXT_COLOR_DEFAULT + u")";

logic/Search.cpp

@@ -266,7 +266,7 @@ LocationPool search(const SearchMode& searchMode, WorldPool& worlds, ItemPool it
         for (auto location : accessibleThisIteration)
         {
             accessibleLocations.push_back(location);
-            const auto& item = location->currentItem; 
+            const Item& item = location->currentItem; 
             if (item.getGameItemId() != GameItem::INVALID && !item.isJunkItem())
             {
                 ownedItems.emplace(item);
@@ -335,23 +335,23 @@ static void pareDownPlaythrough(WorldPool& worlds)
 
     for (auto& sphere : playthroughSpheres)
     {
-        for (auto loc = sphere.begin(); loc != sphere.end(); )
+        for (auto locIt = sphere.begin(); locIt != sphere.end(); )
         {
             // Remove the item at the current location and check if the game is still beatable
-            auto location = *loc;
-            auto itemAtLocation = location->currentItem;
+            auto location = *locIt;
+            const Item itemAtLocation = location->currentItem;
             location->currentItem = {GameItem::INVALID, location->world};
             if (gameBeatable(worlds))
             {
                 // If the game is still beatable, then this location is not required
                 // and we can erase it from the playthrough
-                loc = sphere.erase(loc);
+                locIt = sphere.erase(locIt);
                 nonRequiredLocations.insert({location, itemAtLocation});
             }
             else
             {
                 location->currentItem = itemAtLocation;
-                loc++; // Only increment if we don't erase
+                locIt++; // Only increment if we don't erase
             }
         }
     }