mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
Merge branch 'GetItemFromGet-changes' of github.com:garrettjoecox/OOT into GetItem-renaming
This commit is contained in:
commit
a95edd25de
@ -1639,7 +1639,6 @@ extern "C" GetItemEntry Randomizer_GetItemFromActor(s16 actorId, s16 sceneNum, s
|
|||||||
}
|
}
|
||||||
s16 itemID = OTRGlobals::Instance->gRandomizer->GetItemIdFromActor(actorId, sceneNum, actorParams, ogId);
|
s16 itemID = OTRGlobals::Instance->gRandomizer->GetItemIdFromActor(actorId, sceneNum, actorParams, ogId);
|
||||||
|
|
||||||
// This feels awkward, maybe in the future each mod will have it's own obtainability check
|
|
||||||
if (OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck) != CAN_OBTAIN) {
|
if (OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck) != CAN_OBTAIN) {
|
||||||
return ItemTable_RetrieveEntry(MOD_NONE, GI_RUPEE_BLUE);
|
return ItemTable_RetrieveEntry(MOD_NONE, GI_RUPEE_BLUE);
|
||||||
}
|
}
|
||||||
@ -1656,7 +1655,6 @@ extern "C" GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomi
|
|||||||
}
|
}
|
||||||
s16 itemID = OTRGlobals::Instance->gRandomizer->GetItemIdFromKnownCheck(randomizerCheck, ogId);
|
s16 itemID = OTRGlobals::Instance->gRandomizer->GetItemIdFromKnownCheck(randomizerCheck, ogId);
|
||||||
|
|
||||||
// This feels awkward, maybe in the future each mod will have it's own obtainability check
|
|
||||||
if (OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck) != CAN_OBTAIN) {
|
if (OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerCheck(randomizerCheck) != CAN_OBTAIN) {
|
||||||
return ItemTable_RetrieveEntry(MOD_NONE, GI_RUPEE_BLUE);
|
return ItemTable_RetrieveEntry(MOD_NONE, GI_RUPEE_BLUE);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user