Entrance/Location: remove Getuint32_t method (#6186)
This commit is contained in:
@@ -78,10 +78,6 @@ bool Entrance::ConditionsMet(bool allAgeTimes) const {
|
||||
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
|
||||
bool Entrance::CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway) const {
|
||||
|
||||
|
||||
@@ -50,7 +50,6 @@ class Entrance {
|
||||
std::string GetName() const;
|
||||
void printAgeTimeAccess();
|
||||
bool ConditionsMet(bool allAgeTimes = false) const;
|
||||
uint32_t Getuint32_t() const;
|
||||
bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const;
|
||||
RandomizerRegion GetConnectedRegionKey() const;
|
||||
RandomizerRegion GetOriginalConnectedRegionKey() const;
|
||||
|
||||
@@ -72,10 +72,6 @@ bool Rando::Location::IsVanillaCompletion() const {
|
||||
return isVanillaCompletion;
|
||||
}
|
||||
|
||||
uint32_t Rando::Location::Getuint32_t() const {
|
||||
return hintKey;
|
||||
}
|
||||
|
||||
const HintText& Rando::Location::GetHint() const {
|
||||
return StaticData::hintTextTable[hintKey];
|
||||
}
|
||||
|
||||
@@ -121,7 +121,6 @@ class Location {
|
||||
bool IsOverworld() const;
|
||||
bool IsShop() const;
|
||||
bool IsVanillaCompletion() const;
|
||||
uint32_t Getuint32_t() const;
|
||||
const HintText& GetHint() const;
|
||||
RandomizerGet GetVanillaItem() const;
|
||||
int16_t GetVanillaPrice() const;
|
||||
|
||||
@@ -481,7 +481,7 @@ void Region::RemoveExit(Rando::Entrance* exitToRemove) {
|
||||
|
||||
void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) {
|
||||
for (auto& exit : exits) {
|
||||
if (exit.Getuint32_t() == exitToBePrimary) {
|
||||
if (exit.GetConnectedRegionKey() == exitToBePrimary) {
|
||||
exit.SetAsPrimary();
|
||||
return;
|
||||
}
|
||||
@@ -490,7 +490,7 @@ void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) {
|
||||
|
||||
Rando::Entrance* Region::GetExit(RandomizerRegion exitToReturn) {
|
||||
for (auto& exit : exits) {
|
||||
if (exit.Getuint32_t() == exitToReturn) {
|
||||
if (exit.GetConnectedRegionKey() == exitToReturn) {
|
||||
return &exit;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user