From 7ca9b81e166617fd53b3f479529488bc88d7061d Mon Sep 17 00:00:00 2001 From: mcmartin Date: Fri, 20 Jan 2006 13:56:22 +0000 Subject: [PATCH] optMeleeZoom and optWhichIntro now set properly by SetGlobalOptions git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2222 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/sc2code/setupmenu.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 4f051ea26..8997424e7 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.5: +- Melee Scale and Slides/Movies now take effect immediately - Michael - The intro now plays only when a new game is started - Alex - fixed uio_rename() and some other cases where a new file is created under specific circumstances. - SvdB diff --git a/sc2/src/sc2code/setupmenu.c b/sc2/src/sc2code/setupmenu.c index f69fda700..e33df6d22 100644 --- a/sc2/src/sc2code/setupmenu.c +++ b/sc2/src/sc2code/setupmenu.c @@ -999,6 +999,8 @@ SetGlobalOptions (GLOBALOPTS *opts) 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; + optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC; res_PutBoolean ("config.subtitles", opts->subtitles == OPTVAL_ENABLED); res_PutBoolean ("config.textmenu", opts->menu == OPTVAL_PC);