adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve the remix options between visits to the setup menu; bug #1132

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3653 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-07-17 17:59:57 +00:00
parent 8d9132725a
commit 540e92658e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+3
View File
@@ -1,4 +1,6 @@
Changes towards version 0.8: 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 - Removed the remnants of the --music option (bug #1133) - Alex
- Fixed flagship re-entering the inner system after an encounter in the - Fixed flagship re-entering the inner system after an encounter in the
outer system, thus trapping the player (bug #1135) - Alex 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), - Refactor Melnorme comm code to make modding easier; step 1 (bug #1128),
from Scott A. Colcord from Scott A. Colcord
- Added aspect ratio option to the setup menu - Alex - 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 - Added speech option which controls loading of 3dovoice addon (no need
to set speech volume to 0 anymore) - Alex to set speech volume to 0 anymore) - Alex
- Added the MetaChron story to the no-voice Melnorme script (bug #43) - Alex - Added the MetaChron story to the no-voice Melnorme script (bug #43) - Alex
sc2/src/uqm/setupmenu.c
+2 -1
View File
@@ -1506,13 +1506,14 @@ SetGlobalOptions (GLOBALOPTS *opts)
} }
optSubtitles = (opts->subtitles == OPTVAL_ENABLED) ? TRUE : FALSE; 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; optWhichMenu = (opts->menu == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichFonts = (opts->text == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optWhichFonts = (opts->text == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichCoarseScan = (opts->cscan == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optWhichCoarseScan = (opts->cscan == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optSmoothScroll = (opts->scroll == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optSmoothScroll = (opts->scroll == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichShield = (opts->shield == 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; 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); optSpeech = (opts->speech == OPTVAL_ENABLED);
optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC; optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optStereoSFX = (opts->stereo == OPTVAL_ENABLED); optStereoSFX = (opts->stereo == OPTVAL_ENABLED);