From 95f9ce0df719bb6c611b7affb8762d47f0c8437d Mon Sep 17 00:00:00 2001 From: avolkov Date: Wed, 26 Oct 2005 07:22:36 +0000 Subject: [PATCH] Scaler flags housekeeping git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1929 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/libs/graphics/gfx_common.h | 9 +++++++++ sc2/src/sc2code/setupmenu.c | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sc2/src/sc2code/libs/graphics/gfx_common.h b/sc2/src/sc2code/libs/graphics/gfx_common.h index 7115e2388..3ce24ad9d 100644 --- a/sc2/src/sc2code/libs/graphics/gfx_common.h +++ b/sc2/src/sc2code/libs/graphics/gfx_common.h @@ -41,6 +41,15 @@ enum #define TFB_GFXFLAGS_SCALE_BIADAPT (1<<4) #define TFB_GFXFLAGS_SCALE_BIADAPTADV (1<<5) #define TFB_GFXFLAGS_SCALE_TRISCAN (1<<6) +#define TFB_GFXFLAGS_SCALE_HQXX (1<<7) +#define TFB_GFXFLAGS_SCALE_ANY \ + ( TFB_GFXFLAGS_SCALE_BILINEAR | \ + TFB_GFXFLAGS_SCALE_BIADAPT | \ + TFB_GFXFLAGS_SCALE_BIADAPTADV | \ + TFB_GFXFLAGS_SCALE_TRISCAN | \ + TFB_GFXFLAGS_SCALE_HQXX ) +#define TFB_GFXFLAGS_SCALE_SOFT_ONLY \ + ( TFB_GFXFLAGS_SCALE_ANY & ~TFB_GFXFLAGS_SCALE_BILINEAR ) // The flag variable itself extern int GfxFlags; diff --git a/sc2/src/sc2code/setupmenu.c b/sc2/src/sc2code/setupmenu.c index 8697d98cb..9494fbbd8 100644 --- a/sc2/src/sc2code/setupmenu.c +++ b/sc2/src/sc2code/setupmenu.c @@ -706,10 +706,7 @@ SetGlobalOptions (GLOBALOPTS *opts) int NewDepth = ScreenColorDepth; int NewDriver = GraphicsDriver; - NewGfxFlags &= ~TFB_GFXFLAGS_SCALE_BILINEAR; - NewGfxFlags &= ~TFB_GFXFLAGS_SCALE_BIADAPT; - NewGfxFlags &= ~TFB_GFXFLAGS_SCALE_BIADAPTADV; - NewGfxFlags &= ~TFB_GFXFLAGS_SCALE_TRISCAN; + NewGfxFlags &= ~TFB_GFXFLAGS_SCALE_ANY; switch (opts->res) { case OPTVAL_320_240: