mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
Fixes crashes with Audio_PlayFanfare_Rando
.
This commit is contained in:
parent
203785f76a
commit
3bf92a348c
@ -3919,6 +3919,9 @@ void Audio_PlayFanfare_Rando(GetItemEntry getItem) {
|
|||||||
Audio_PlayFanfare(temp1);
|
Audio_PlayFanfare(temp1);
|
||||||
}
|
}
|
||||||
} else if (getItem.modIndex == MOD_RANDOMIZER) {
|
} else if (getItem.modIndex == MOD_RANDOMIZER) {
|
||||||
|
if ((getItemId >= RG_BOTTLE_WITH_RED_POTION && getItemId <= RG_BOTTLE_WITH_BIG_POE) || (getItemId >= RG_DEKU_TREE_MAP && getItemId <= RG_GANONS_CASTLE_SMALL_KEY)) {
|
||||||
|
temp1 = NA_BGM_ITEM_GET | 0x900;
|
||||||
|
}
|
||||||
// If the setting is toggled on and we get special quest items (longer fanfares):
|
// If the setting is toggled on and we get special quest items (longer fanfares):
|
||||||
if (CVar_GetS32("gRandoQuestItemFanfares", 0) != 0) {
|
if (CVar_GetS32("gRandoQuestItemFanfares", 0) != 0) {
|
||||||
// If we get a medallion, play the "get a medallion" fanfare
|
// If we get a medallion, play the "get a medallion" fanfare
|
||||||
|
@ -123,7 +123,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) {
|
|||||||
}
|
}
|
||||||
Message_StartTextbox(globalCtx, textId, NULL);
|
Message_StartTextbox(globalCtx, textId, NULL);
|
||||||
|
|
||||||
if (gSaveContext.n64ddFlag) {
|
if (gSaveContext.n64ddFlag && getItemId != RG_ICE_TRAP) {
|
||||||
Audio_PlayFanfare_Rando(getItem);
|
Audio_PlayFanfare_Rando(getItem);
|
||||||
} else {
|
} else {
|
||||||
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
|
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
|
||||||
|
Loading…
Reference in New Issue
Block a user