From c37329065f99dd11707fbbc725115401dd2a24b4 Mon Sep 17 00:00:00 2001 From: avolkov Date: Fri, 24 Mar 2006 22:17:12 +0000 Subject: [PATCH] Cleaning up SetFlashRect interface git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2297 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/encount.c | 4 ++-- sc2/src/sc2code/gameopt.c | 6 +++--- sc2/src/sc2code/hyper.c | 2 +- sc2/src/sc2code/menu.c | 2 +- sc2/src/sc2code/pickship.c | 2 +- sc2/src/sc2code/planets/pstarmap.c | 4 ++-- sc2/src/sc2code/planets/scan.c | 2 +- sc2/src/sc2code/planets/solarsys.c | 4 ++-- sc2/src/sc2code/restart.c | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sc2/src/sc2code/encount.c b/sc2/src/sc2code/encount.c index e1f2acaaf..863d008fe 100644 --- a/sc2/src/sc2code/encount.c +++ b/sc2/src/sc2code/encount.c @@ -70,7 +70,7 @@ DoSelectAction (PMENU_STATE pMS) { DrawMenuStateStrings (PM_CONVERSE, pMS->CurState); LockMutex (GraphicsLock); - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); } return ((BOOLEAN)pMS->Initialized); @@ -318,7 +318,7 @@ InitEncounter (void) DrawMenuStateStrings (PM_CONVERSE, MenuState.CurState = HAIL); LockMutex (GraphicsLock); - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); DoInput ((PVOID)&MenuState, TRUE); diff --git a/sc2/src/sc2code/gameopt.c b/sc2/src/sc2code/gameopt.c index cea8e6f3b..d63db7609 100644 --- a/sc2/src/sc2code/gameopt.c +++ b/sc2/src/sc2code/gameopt.c @@ -265,7 +265,7 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state) if (!(state & DDSHS_EDIT)) { // normal state - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); if (pMS->InputFunc == DoNaming) { @@ -953,7 +953,7 @@ Restart: else if (PulsedInputState.key[KEY_MENU_CANCEL]) { LockMutex (GraphicsLock); - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); pMS->ModuleFrame = 0; pMS->CurState = (BYTE)pMS->delta_item; @@ -1180,7 +1180,7 @@ ChangeGameSelection: } UnbatchGraphics (); } - SetFlashRect (0, (FRAME)0); + SetFlashRect (NULL_PTR, (FRAME)0); UnlockMutex (GraphicsLock); } } diff --git a/sc2/src/sc2code/hyper.c b/sc2/src/sc2code/hyper.c index eeaf5d262..aed8b054e 100644 --- a/sc2/src/sc2code/hyper.c +++ b/sc2/src/sc2code/hyper.c @@ -1590,7 +1590,7 @@ UnbatchGraphics (); DrawMenuStateStrings (PM_STARMAP, STARMAP); LockMutex (GraphicsLock); - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); diff --git a/sc2/src/sc2code/menu.c b/sc2/src/sc2code/menu.c index 6be1c0f1f..7b8e62d25 100644 --- a/sc2/src/sc2code/menu.c +++ b/sc2/src/sc2code/menu.c @@ -580,7 +580,7 @@ DrawMenuStateStrings (BYTE beg_index, SWORD NewState) && flash_rect.corner.y == RADAR_Y && flash_rect.extent.width == RADAR_WIDTH && flash_rect.extent.height == RADAR_HEIGHT) - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); SetContext (OldContext); UnlockMutex (GraphicsLock); } diff --git a/sc2/src/sc2code/pickship.c b/sc2/src/sc2code/pickship.c index cbcfccfc7..369c681a0 100644 --- a/sc2/src/sc2code/pickship.c +++ b/sc2/src/sc2code/pickship.c @@ -230,7 +230,7 @@ ChangeSelection: font_DrawText (&t); } - SetFlashRect ((RECT *)0, (FRAME)0); + SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (&pMS->flash_rect0, (FRAME)0); UnlockMutex (GraphicsLock); } diff --git a/sc2/src/sc2code/planets/pstarmap.c b/sc2/src/sc2code/planets/pstarmap.c index f5845f336..6253c2687 100644 --- a/sc2/src/sc2code/planets/pstarmap.c +++ b/sc2/src/sc2code/planets/pstarmap.c @@ -1773,7 +1773,7 @@ DoFlagshipCommands (PMENU_STATE pMS) --pMS->Initialized; pSolarSysState->PauseRotate = 0; LockMutex (GraphicsLock); - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); break; } @@ -1809,7 +1809,7 @@ DoFlagshipCommands (PMENU_STATE pMS) else if (pMS->CurState) { LockMutex (GraphicsLock); - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); if (select) { diff --git a/sc2/src/sc2code/planets/scan.c b/sc2/src/sc2code/planets/scan.c index 3a5471350..3d761f4bb 100644 --- a/sc2/src/sc2code/planets/scan.c +++ b/sc2/src/sc2code/planets/scan.c @@ -802,7 +802,7 @@ PickPlanetSide (PMENU_STATE pMS) DrawMenuStateStrings (PM_MIN_SCAN, DISPATCH_SHUTTLE); LockMutex (GraphicsLock); - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); UnlockMutex (GraphicsLock); ExitPlanetSide: diff --git a/sc2/src/sc2code/planets/solarsys.c b/sc2/src/sc2code/planets/solarsys.c index 02493d76b..11825d1b8 100644 --- a/sc2/src/sc2code/planets/solarsys.c +++ b/sc2/src/sc2code/planets/solarsys.c @@ -1237,7 +1237,7 @@ IP_frame (void) pSolarSysState->MenuState.CurState = STARMAP + 1; IP_input_state = 0; } - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); FlushInput (); UnlockMutex (GraphicsLock); } @@ -1401,7 +1401,7 @@ StartGroups: DrawMenuStateStrings (PM_SCAN, SCAN); LockMutex (GraphicsLock); pSolarSysState->MenuState.CurState = SCAN + 1; - SetFlashRect ((PRECT)~0L, (FRAME)0); + SetFlashRect (SFR_MENU_3DO, (FRAME)0); FlushInput (); UnlockMutex (GraphicsLock); } diff --git a/sc2/src/sc2code/restart.c b/sc2/src/sc2code/restart.c index 53116fffc..e9ca6bdbc 100644 --- a/sc2/src/sc2code/restart.c +++ b/sc2/src/sc2code/restart.c @@ -320,7 +320,7 @@ RestartMenu (PMENU_STATE pMS) } LockMutex (GraphicsLock); - SetFlashRect ((PRECT)0, (FRAME)0); + SetFlashRect (NULL_PTR, (FRAME)0); UnlockMutex (GraphicsLock); DestroyDrawable (ReleaseDrawable (pMS->CurFrame));