nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Entrance/Location: remove Getuint32_t method (#6186)

Browse Source
This commit is contained in:
Philip Dubé
2026-01-21 16:33:35 +00:00
committed by GitHub
parent 78c68ae3d4
commit 6b160fac1c
5 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/entrance.cpp
View File

@@ -78,10 +78,6 @@ bool Entrance::ConditionsMet(bool allAgeTimes) const {
return conditionsMet && (!allAgeTimes || conditionsMet == 4); return conditionsMet && (!allAgeTimes || conditionsMet == 4);
} }
uint32_t Entrance::Getuint32_t() const {
return connectedRegion;
}
// set the logic to be a specific age and time of day and see if the condition still holds // set the logic to be a specific age and time of day and see if the condition still holds
bool Entrance::CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway) const { bool Entrance::CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway) const {

1
soh/soh/Enhancements/randomizer/entrance.h
View File

@@ -50,7 +50,6 @@ class Entrance {
std::string GetName() const; std::string GetName() const;
void printAgeTimeAccess(); void printAgeTimeAccess();
bool ConditionsMet(bool allAgeTimes = false) const; bool ConditionsMet(bool allAgeTimes = false) const;
uint32_t Getuint32_t() const;
bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const; bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const;
RandomizerRegion GetConnectedRegionKey() const; RandomizerRegion GetConnectedRegionKey() const;
RandomizerRegion GetOriginalConnectedRegionKey() const; RandomizerRegion GetOriginalConnectedRegionKey() const;

4
soh/soh/Enhancements/randomizer/location.cpp
View File

@@ -72,10 +72,6 @@ bool Rando::Location::IsVanillaCompletion() const {
return isVanillaCompletion; return isVanillaCompletion;
} }
uint32_t Rando::Location::Getuint32_t() const {
return hintKey;
}
const HintText& Rando::Location::GetHint() const { const HintText& Rando::Location::GetHint() const {
return StaticData::hintTextTable[hintKey]; return StaticData::hintTextTable[hintKey];
} }

1
soh/soh/Enhancements/randomizer/location.h
View File

@@ -121,7 +121,6 @@ class Location {
bool IsOverworld() const; bool IsOverworld() const;
bool IsShop() const; bool IsShop() const;
bool IsVanillaCompletion() const; bool IsVanillaCompletion() const;
uint32_t Getuint32_t() const;
const HintText& GetHint() const; const HintText& GetHint() const;
RandomizerGet GetVanillaItem() const; RandomizerGet GetVanillaItem() const;
int16_t GetVanillaPrice() const; int16_t GetVanillaPrice() const;

4
soh/soh/Enhancements/randomizer/location_access.cpp
View File

@@ -481,7 +481,7 @@ void Region::RemoveExit(Rando::Entrance* exitToRemove) {
void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) { void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) {
for (auto& exit : exits) { for (auto& exit : exits) {
if (exit.Getuint32_t() == exitToBePrimary) { if (exit.GetConnectedRegionKey() == exitToBePrimary) {
exit.SetAsPrimary(); exit.SetAsPrimary();
return; return;
} }
@@ -490,7 +490,7 @@ void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) {
Rando::Entrance* Region::GetExit(RandomizerRegion exitToReturn) { Rando::Entrance* Region::GetExit(RandomizerRegion exitToReturn) {
for (auto& exit : exits) { for (auto& exit : exits) {
if (exit.Getuint32_t() == exitToReturn) { if (exit.GetConnectedRegionKey() == exitToReturn) {
return &exit; return &exit;
} }
} }