diff --git a/Assets/dll/dsda.wbx.zst b/Assets/dll/dsda.wbx.zst index 6fac58c518..1d899737a6 100644 Binary files a/Assets/dll/dsda.wbx.zst and b/Assets/dll/dsda.wbx.zst differ diff --git a/waterbox/dsda/BizhawkInterface.c b/waterbox/dsda/BizhawkInterface.c index 6bb6277bc2..4cabacfefc 100644 --- a/waterbox/dsda/BizhawkInterface.c +++ b/waterbox/dsda/BizhawkInterface.c @@ -6,29 +6,9 @@ AutomapButtons last_buttons = { 0 }; void render_updates(struct PackedRenderInfo *renderInfo) { - if (renderInfo->Gamma != dsda_IntConfig(dsda_config_usegamma)) - { - dsda_UpdateIntConfig(dsda_config_usegamma, renderInfo->Gamma, true); - dsda_AddMessage(usegamma == 0 ? GAMMALVL0 : - usegamma == 1 ? GAMMALVL1 : - usegamma == 2 ? GAMMALVL2 : - usegamma == 3 ? GAMMALVL3 : - GAMMALVL4); - } - - if (renderInfo->MapOverlay != dsda_IntConfig(dsda_config_automap_overlay)) - { - dsda_UpdateIntConfig(dsda_config_automap_overlay, renderInfo->MapOverlay, true); - dsda_AddMessage(automap_overlay == 0 ? AMSTR_OVERLAYOFF : - automap_overlay == 1 ? AMSTR_OVERLAYON : - "Overlay Mode Dark"); - } - - if (renderInfo->ShowMessages != dsda_ShowMessages()) - dsda_UpdateIntConfig(dsda_config_show_messages, renderInfo->ShowMessages, true); - - dsda_UpdateIntConfig(dsda_config_screenblocks, renderInfo->HeadsUpMode != HUD_VANILLA ? 11 : 10, true); - dsda_UpdateIntConfig(dsda_config_hud_displayed, renderInfo->HeadsUpMode == HUD_NONE ? 0 : 1, true); + dsda_UpdateIntConfig(dsda_config_usegamma, renderInfo->Gamma, true); + dsda_UpdateIntConfig(dsda_config_automap_overlay, renderInfo->MapOverlay, true); + dsda_UpdateIntConfig(dsda_config_show_messages, renderInfo->ShowMessages, true); dsda_UpdateIntConfig(dsda_config_sfx_volume, renderInfo->SfxVolume, true); dsda_UpdateIntConfig(dsda_config_music_volume, renderInfo->MusicVolume, true); dsda_UpdateIntConfig(dsda_config_hudadd_secretarea, renderInfo->ReportSecrets, true); @@ -38,6 +18,8 @@ void render_updates(struct PackedRenderInfo *renderInfo) dsda_UpdateIntConfig(dsda_config_map_totals, renderInfo->MapTotals, true); dsda_UpdateIntConfig(dsda_config_map_time, renderInfo->MapTime, true); dsda_UpdateIntConfig(dsda_config_map_coordinates, renderInfo->MapCoordinates, true); + dsda_UpdateIntConfig(dsda_config_screenblocks, renderInfo->HeadsUpMode != HUD_VANILLA ? 11 : 10, true); + dsda_UpdateIntConfig(dsda_config_hud_displayed, renderInfo->HeadsUpMode == HUD_NONE ? 0 : 1, true); } void automap_inputs(AutomapButtons buttons) diff --git a/waterbox/dsda/core b/waterbox/dsda/core index aedab0b282..44fcb8a3cb 160000 --- a/waterbox/dsda/core +++ b/waterbox/dsda/core @@ -1 +1 @@ -Subproject commit aedab0b2825646f06f85a9d13b4c67e231baa5dc +Subproject commit 44fcb8a3cb7025ec54b80217ca6e6d71607ab914