Random Cleanups

- Use getProgressionLocations more
- Make another Location member function const
- Use int literal instead of bool for some setting defaults

Author: SuperDude88

logic/Fill.cpp

@@ -339,7 +339,7 @@ void determineMajorItems(WorldPool& worlds, ItemPool& itemPool, LocationPool& al
     }
     for (auto& world : worlds)
     {
-        for (auto& location : world.getLocations(true))
+        for (auto& location : world.getProgressionLocations())
         {
             if (location->currentItem.getGameItemId() != GameItem::INVALID)
             {

logic/Hints.cpp

@@ -54,7 +54,7 @@ static HintError calculatePossiblePathLocations(WorldPool& worlds)
     // and seeing if taking away the item at each location can still access the goal locations
     for (auto& world : worlds)
     {
-        for (auto& potentialPathLocation : world.getLocations(true))
+        for (auto& potentialPathLocation : world.getProgressionLocations())
         {
             const Item itemAtLocation = potentialPathLocation->currentItem;
             if (itemAtLocation.isJunkItem())
@@ -68,7 +68,7 @@ static HintError calculatePossiblePathLocations(WorldPool& worlds)
             // Run a search without the item
             runGeneralSearch(worlds);
 
-            for (auto& location : world.getLocations(true))
+            for (auto& location : world.getProgressionLocations())
             {
                 // If we never reached the goal location, then this location
                 // is "on the path to" the goal location. Since hints will refer
@@ -85,7 +85,7 @@ static HintError calculatePossiblePathLocations(WorldPool& worlds)
         }
 
         #ifdef ENABLE_DEBUG
-            for (auto& location : world.getLocations(true))
+            for (auto& location : world.getProgressionLocations())
             {
                 LOG_TO_DEBUG("Path locations for " + location->getName() + " [");
                 for (auto& pathLocation : location->pathLocations)
@@ -681,7 +681,7 @@ static HintError assignHoHoHints(World& world, WorldPool& worlds, std::list<Hint
     // If ho ho is hinting triforces, make those hints now
     if (world.getSettings().ho_ho_triforce_hints)
     {
-        for (auto location : world.getLocations(/*onlyProgression =*/ true))
+        for (const auto location : world.getProgressionLocations())
         {
             if (location->currentItem.isTriforceShard())
             {
@@ -765,7 +765,7 @@ static HintError assignKreebHints(World& world, WorldPool& worlds)
     // Get all bow locations
     // Shuffle locations to prevent any possible meta-gaming where the last bow might be
     // since otherwise they'll appear in order of location id
-    auto allLocations = world.getLocations(/*onlyProgression = */ true);
+    auto allLocations = world.getProgressionLocations();
     shufflePool(allLocations);
     for (auto& location : allLocations)
     {
@@ -782,7 +782,7 @@ static HintError assignKorlSwordHints(World& world, WorldPool& worlds)
     // Get all sword locations
     // Shuffle locations to prevent any possible meta-gaming where the swords bow might be
     // since otherwise they'll appear in order of location id
-    auto allLocations = world.getLocations(/*onlyProgression = */ true);
+    auto allLocations = world.getProgressionLocations();
     shufflePool(allLocations);
     for (auto& location : allLocations)
     {

logic/Location.cpp

@@ -190,7 +190,7 @@ bool Location::isBarrenAsChainLocation() const
     return !progression || (currentItem.canBeInBarrenRegion() && !isRequiredBossLocation);
 }
 
-std::u16string Location::generateImportanceText(const std::string& language)
+std::u16string Location::generateImportanceText(const std::string& language) const
 {
     const Item& item = currentItem;
 

logic/Location.hpp

@@ -141,7 +141,7 @@ class Location
     bool operator<(const Location& rhs) const;
 
     std::string getName() const;
-    std::u16string generateImportanceText(const std::string& language);
+    std::u16string generateImportanceText(const std::string& language) const;
     bool currentItemCanBeBarren() const;
     bool isBarrenAsChainLocation() const;
 };

options.cpp

@@ -66,10 +66,10 @@ void Settings::resetDefaultSettings() {
     kreeb_bow_hints = false;
     ho_ho_hints = false;
     ho_ho_triforce_hints = false;
-    path_hints = false;
-    barren_hints = false;
-    item_hints = false;
-    location_hints = false;
+    path_hints = 0;
+    barren_hints = 0;
+    item_hints = 0;
+    location_hints = 0;
     use_always_hints = false;
     clearer_hints = false;
     hint_importance = false;

tweaks.cpp

@@ -1316,7 +1316,7 @@ TweakError update_ho_ho_dialog(World& world) {
 }
 
 TweakError update_kreeb_dialog(World& world) {
-    // Don't change text if theres no kreeb hints
+    // Don't change text if theres no Kreeb hints
     if (world.kreebHints.empty()) {
         return TweakError::NONE;
     }
@@ -1348,7 +1348,6 @@ TweakError update_kreeb_dialog(World& world) {
 }
 
 TweakError rotate_ho_ho_to_face_hints(World& world) {
-
     // If no ho ho hints, don't do anything
     if (world.hohoHints.empty()) {
         return TweakError::NONE;