github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:Malkierian/Shipwright into preset-manager

Browse source
This commit is contained in:
Malkierian 2025-05-21 11:30:32 -07:00
commit 2a9e5899b7
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soh/soh/Enhancements/randomizer/location_access.cpp
View file

@ -535,17 +535,17 @@ std::string CleanCheckConditionString(std::string condition) {
} }
namespace Regions { namespace Regions {
const auto GetAllRegions() { auto GetAllRegions() {
static const size_t regionCount = RR_MAX - (RR_NONE + 1); static const size_t regionCount = RR_MAX - (RR_NONE + 1);
static std::array<RandomizerRegion, regionCount> allRegions = {}; static std::array<RandomizerRegion, regionCount> allRegions = {};
static bool intialized = false; static bool initialized = false;
if (!intialized) { if (!initialized) {
for (size_t i = 0; i < regionCount; i++) { for (size_t i = 0; i < regionCount; i++) {
allRegions[i] = (RandomizerRegion)((RR_NONE + 1) + i); allRegions[i] = (RandomizerRegion)((RR_NONE + 1) + i);
} }
intialized = true; initialized = true;
} }
return allRegions; return allRegions;
@ -684,7 +684,7 @@ std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type,
Rando::Entrance* GetEntrance(RandomizerRegion source, RandomizerRegion destination) { Rando::Entrance* GetEntrance(RandomizerRegion source, RandomizerRegion destination) {
for (auto& exit : RegionTable(source)->exits) { for (auto& exit : RegionTable(source)->exits) {
if (exit.GetConnectedRegionKey() == destination) { if (exit.GetOriginalConnectedRegionKey() == destination) {
return &exit; return &exit;
} }
} }