From 540e92658e58c107d0b8dcb0667c95a8476edaa7 Mon Sep 17 00:00:00 2001 From: avolkov Date: Sun, 17 Jul 2011 17:59:57 +0000 Subject: [PATCH] Preserve the remix options between visits to the setup menu; bug #1132 git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3653 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 3 +++ sc2/src/uqm/setupmenu.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index b9cb1f4af..4c0356d1f 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.8: +- All Sound Options are now preserved between visits to the setup menu. + Some options still require a restart (bug #1132) - Alex - Removed the remnants of the --music option (bug #1133) - Alex - Fixed flagship re-entering the inner system after an encounter in the outer system, thus trapping the player (bug #1135) - Alex @@ -7,6 +9,7 @@ Changes towards version 0.8: - Refactor Melnorme comm code to make modding easier; step 1 (bug #1128), from Scott A. Colcord - Added aspect ratio option to the setup menu - Alex +- Positional audio setup menu option now has an immediate effect - Alex - Added speech option which controls loading of 3dovoice addon (no need to set speech volume to 0 anymore) - Alex - Added the MetaChron story to the no-voice Melnorme script (bug #43) - Alex diff --git a/sc2/src/uqm/setupmenu.c b/sc2/src/uqm/setupmenu.c index 2c07128ee..f4b02658b 100644 --- a/sc2/src/uqm/setupmenu.c +++ b/sc2/src/uqm/setupmenu.c @@ -1506,13 +1506,14 @@ SetGlobalOptions (GLOBALOPTS *opts) } optSubtitles = (opts->subtitles == OPTVAL_ENABLED) ? TRUE : FALSE; - // optWhichMusic = (opts->music == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optWhichMenu = (opts->menu == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optWhichFonts = (opts->text == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optWhichCoarseScan = (opts->cscan == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optSmoothScroll = (opts->scroll == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optWhichShield = (opts->shield == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optMeleeScale = (opts->meleezoom == OPTVAL_3DO) ? TFB_SCALE_TRILINEAR : TFB_SCALE_STEP; + opt3doMusic = (opts->music3do == OPTVAL_ENABLED); + optRemixMusic = (opts->musicremix == OPTVAL_ENABLED); optSpeech = (opts->speech == OPTVAL_ENABLED); optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optStereoSFX = (opts->stereo == OPTVAL_ENABLED);