X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=de9c097383a4626dd85ce693d189903dd4b81e0f;hb=f60e97c16b1c14ffd21d9f9ca86ad0be52dfa9b4;hp=a04d75dc3e6b204e7538d9c384ccd323ea8a62fe;hpb=350a8b1817f6696d4ba926e6d55ddd157e45b836;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index a04d75dc..de9c0973 100644 --- a/src/screens.c +++ b/src/screens.c @@ -155,7 +155,7 @@ void DrawMainMenu() /* needed if last screen was the setup screen and fullscreen state changed */ ToggleFullscreenIfNeeded(); - /* needed if last screen (setup/level) changed graphics, sounds or music */ + /* needed if last screen (level choice) changed graphics, sounds or music */ ReloadCustomArtwork(); #ifdef TARGET_SDL @@ -1370,23 +1370,25 @@ static void execSetupGame() static void execSetupGraphics() { - setup.graphics_set = artwork.gfx_current->name; - setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); } static void execSetupSound() { - setup.sounds_set = artwork.snd_current->name; - setup.music_set = artwork.mus_current->name; - setup_mode = SETUP_MODE_SOUND; DrawSetupScreen(); } static void execSetupArtwork() { + /* needed if last screen (setup choice) changed graphics, sounds or music */ + ReloadCustomArtwork(); + + setup.graphics_set = artwork.gfx_current->name; + setup.sounds_set = artwork.snd_current->name; + setup.music_set = artwork.mus_current->name; + setup_mode = SETUP_MODE_ARTWORK; DrawSetupScreen(); } @@ -1661,7 +1663,7 @@ static void DrawSetupScreen_Generic() else if (setup_mode == SETUP_MODE_ARTWORK) { setup_info = setup_info_artwork; - title_string = "Setup Sound"; + title_string = "Custom Artwork"; } else if (setup_mode == SETUP_MODE_SHORTCUT) {