mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-12-23 16:48:52 -05:00
Fixes Lost Woods Bridge Ice Trap in Rando (#1313)
This commit is contained in:
parent
90067be132
commit
c2fed1a382
@ -255,10 +255,10 @@ void GivePlayerRandoRewardSariaGift(GlobalContext* globalCtx, RandomizerCheck ch
|
|||||||
if (gSaveContext.entranceIndex == 0x05E0) {
|
if (gSaveContext.entranceIndex == 0x05E0) {
|
||||||
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_ZELDAS_LULLABY);
|
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_ZELDAS_LULLABY);
|
||||||
|
|
||||||
if ((!Flags_GetEventChkInf(0xC1) || (player->getItemId == getItemEntry.getItemId && getItemEntry.getItemId != GI_ICE_TRAP)) &&
|
if (!Flags_GetEventChkInf(0xC1) && player != NULL && !Player_InBlockingCsMode(globalCtx, player)) {
|
||||||
player != NULL && !Player_InBlockingCsMode(globalCtx, player)) {
|
|
||||||
GiveItemEntryWithoutActor(globalCtx, getItemEntry);
|
GiveItemEntryWithoutActor(globalCtx, getItemEntry);
|
||||||
Flags_SetEventChkInf(0xC1);
|
player->pendingFlag.flagType = FLAG_EVENT_CHECK_INF;
|
||||||
|
player->pendingFlag.flagID = 0xC1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user