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

fix an assert and va_arg linux crash (#6075)

Browse Source
This commit is contained in:
Pepper0ni
2026-01-02 20:55:30 +00:00
committed by GitHub
parent 6f060a9222
commit ef2b4cd42c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp
View File

@@ -776,8 +776,8 @@ void RegisterFileSelectMoreInfo() {
COND_VB_SHOULD(VB_FILE_SELECT_DRAW_QUEST_ITEMS, CVAR_FILE_SELECT_MORE_INFO_VALUE, { COND_VB_SHOULD(VB_FILE_SELECT_DRAW_QUEST_ITEMS, CVAR_FILE_SELECT_MORE_INFO_VALUE, {
FileChooseContext* thisx = va_arg(args, FileChooseContext*); FileChooseContext* thisx = va_arg(args, FileChooseContext*);
s16 fileIndex = va_arg(args, s16); s32 fileIndex = va_arg(args, s32);
u8 textAlpha = va_arg(args, u8); u32 textAlpha = va_arg(args, u32);
if (thisx->menuMode == FS_MENU_MODE_SELECT) { if (thisx->menuMode == FS_MENU_MODE_SELECT) {
DrawMoreInfo(thisx, fileIndex, textAlpha); DrawMoreInfo(thisx, fileIndex, textAlpha);

2
soh/soh/Enhancements/randomizer/location_access/overworld/desert_colossus.cpp
View File

@@ -23,7 +23,7 @@ void RegionTable_Init_DesertColossus() {
}, { }, {
//Exits //Exits
//You can kinda get the fairies without entering the water, but it relies on them cooperating and leevers are jerks. should be a trick //You can kinda get the fairies without entering the water, but it relies on them cooperating and leevers are jerks. should be a trick
Entrance(RR_DESERT_COLOSSUS_OASIS, []{return logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_EMPTY_BOTTLE));}), Entrance(RR_DESERT_COLOSSUS_OASIS, []{return logic->CanUse(RG_SONG_OF_STORMS) && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->HasItem(RG_EMPTY_BOTTLE));}),
Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, []{return logic->HasExplosives();}), Entrance(RR_COLOSSUS_GREAT_FAIRY_FOUNTAIN, []{return logic->HasExplosives();}),
Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY, []{return true;}), Entrance(RR_SPIRIT_TEMPLE_ENTRYWAY, []{return true;}),
Entrance(RR_WASTELAND_NEAR_COLOSSUS, []{return true;}), Entrance(RR_WASTELAND_NEAR_COLOSSUS, []{return true;}),