From 1030ede817f3dc1d6edb9b5cae39250949727d90 Mon Sep 17 00:00:00 2001 From: avolkov Date: Fri, 24 Mar 2006 21:55:20 +0000 Subject: [PATCH] Cleaner and fixed SetFlashRect interface for menu rect git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2293 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/sis.c | 4 ++-- sc2/src/sc2code/sis.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/sis.c b/sc2/src/sc2code/sis.c index 3bcaaba42..e5d237fd7 100644 --- a/sc2/src/sc2code/sis.c +++ b/sc2/src/sc2code/sis.c @@ -1476,7 +1476,7 @@ SetFlashRect (PRECT pRect, FRAME f) old_f = flash_frame; flash_rect1 = flash_rect; - if (pRect != (PRECT)~0L) + if (pRect != SFR_MENU_3DO && pRect != SFR_MENU_ANY) { GetContextClipRect (&clip_r); OldContext = SetContext (ScreenContext); @@ -1484,7 +1484,7 @@ SetFlashRect (PRECT pRect, FRAME f) else { //Don't flash when using the PC menu - if (optWhichMenu == OPT_PC) + if (optWhichMenu == OPT_PC && pRect != SFR_MENU_ANY) { OldContext = SetContext (ScreenContext); pRect = 0; diff --git a/sc2/src/sc2code/sis.h b/sc2/src/sc2code/sis.h index 25b3f3d5a..f494e14cb 100644 --- a/sc2/src/sc2code/sis.h +++ b/sc2/src/sc2code/sis.h @@ -252,6 +252,8 @@ extern void InitSISContexts (void); extern void DrawSISFrame (void); extern void ClearSISRect (BYTE ClearFlags); extern void SetFlashRect (PRECT pRect, FRAME f); +#define SFR_MENU_3DO ((PRECT)~0L) +#define SFR_MENU_ANY ((PRECT)~1L) extern void DrawHyperCoords (POINT puniverse); extern void DrawSISTitle (UNICODE *pStr); extern BOOLEAN DrawSISMessageEx (const UNICODE *pStr, SIZE CurPos,