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

Cleaning up SetFlashRect interface

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2297 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-03-24 22:17:12 +00:00
parent 5eda6957ec
commit c37329065f
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/encount.c
+2 -2
View File
@@ -70,7 +70,7 @@ DoSelectAction (PMENU_STATE pMS)
{ {
DrawMenuStateStrings (PM_CONVERSE, pMS->CurState); DrawMenuStateStrings (PM_CONVERSE, pMS->CurState);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
return ((BOOLEAN)pMS->Initialized); return ((BOOLEAN)pMS->Initialized);
@@ -318,7 +318,7 @@ InitEncounter (void)
DrawMenuStateStrings (PM_CONVERSE, MenuState.CurState = HAIL); DrawMenuStateStrings (PM_CONVERSE, MenuState.CurState = HAIL);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
DoInput ((PVOID)&MenuState, TRUE); DoInput ((PVOID)&MenuState, TRUE);
sc2/src/sc2code/gameopt.c
+3 -3
View File
@@ -265,7 +265,7 @@ DrawDescriptionString (PMENU_STATE pMS, COUNT which_string, COUNT state)
if (!(state & DDSHS_EDIT)) if (!(state & DDSHS_EDIT))
{ // normal state { // normal state
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
if (pMS->InputFunc == DoNaming) if (pMS->InputFunc == DoNaming)
{ {
@@ -953,7 +953,7 @@ Restart:
else if (PulsedInputState.key[KEY_MENU_CANCEL]) else if (PulsedInputState.key[KEY_MENU_CANCEL])
{ {
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
pMS->ModuleFrame = 0; pMS->ModuleFrame = 0;
pMS->CurState = (BYTE)pMS->delta_item; pMS->CurState = (BYTE)pMS->delta_item;
@@ -1180,7 +1180,7 @@ ChangeGameSelection:
} }
UnbatchGraphics (); UnbatchGraphics ();
} }
SetFlashRect (0, (FRAME)0); SetFlashRect (NULL_PTR, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
} }
sc2/src/sc2code/hyper.c
+1 -1
View File
@@ -1590,7 +1590,7 @@ UnbatchGraphics ();
DrawMenuStateStrings (PM_STARMAP, STARMAP); DrawMenuStateStrings (PM_STARMAP, STARMAP);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT); SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
sc2/src/sc2code/menu.c
+1 -1
View File
@@ -580,7 +580,7 @@ DrawMenuStateStrings (BYTE beg_index, SWORD NewState)
&& flash_rect.corner.y == RADAR_Y && flash_rect.corner.y == RADAR_Y
&& flash_rect.extent.width == RADAR_WIDTH && flash_rect.extent.width == RADAR_WIDTH
&& flash_rect.extent.height == RADAR_HEIGHT) && flash_rect.extent.height == RADAR_HEIGHT)
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
SetContext (OldContext); SetContext (OldContext);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
sc2/src/sc2code/pickship.c
+1 -1
View File
@@ -230,7 +230,7 @@ ChangeSelection:
font_DrawText (&t); font_DrawText (&t);
} }
SetFlashRect ((RECT *)0, (FRAME)0); SetFlashRect (NULL_PTR, (FRAME)0);
SetFlashRect (&pMS->flash_rect0, (FRAME)0); SetFlashRect (&pMS->flash_rect0, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
sc2/src/sc2code/planets/pstarmap.c
+2 -2
View File
@@ -1773,7 +1773,7 @@ DoFlagshipCommands (PMENU_STATE pMS)
--pMS->Initialized; --pMS->Initialized;
pSolarSysState->PauseRotate = 0; pSolarSysState->PauseRotate = 0;
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
break; break;
} }
@@ -1809,7 +1809,7 @@ DoFlagshipCommands (PMENU_STATE pMS)
else if (pMS->CurState) else if (pMS->CurState)
{ {
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
if (select) if (select)
{ {
sc2/src/sc2code/planets/scan.c
+1 -1
View File
@@ -802,7 +802,7 @@ PickPlanetSide (PMENU_STATE pMS)
DrawMenuStateStrings (PM_MIN_SCAN, DISPATCH_SHUTTLE); DrawMenuStateStrings (PM_MIN_SCAN, DISPATCH_SHUTTLE);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
ExitPlanetSide: ExitPlanetSide:
sc2/src/sc2code/planets/solarsys.c
+2 -2
View File
@@ -1237,7 +1237,7 @@ IP_frame (void)
pSolarSysState->MenuState.CurState = STARMAP + 1; pSolarSysState->MenuState.CurState = STARMAP + 1;
IP_input_state = 0; IP_input_state = 0;
} }
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
FlushInput (); FlushInput ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
@@ -1401,7 +1401,7 @@ StartGroups:
DrawMenuStateStrings (PM_SCAN, SCAN); DrawMenuStateStrings (PM_SCAN, SCAN);
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
pSolarSysState->MenuState.CurState = SCAN + 1; pSolarSysState->MenuState.CurState = SCAN + 1;
SetFlashRect ((PRECT)~0L, (FRAME)0); SetFlashRect (SFR_MENU_3DO, (FRAME)0);
FlushInput (); FlushInput ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
} }
sc2/src/sc2code/restart.c
+1 -1
View File
@@ -320,7 +320,7 @@ RestartMenu (PMENU_STATE pMS)
} }
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
SetFlashRect ((PRECT)0, (FRAME)0); SetFlashRect (NULL_PTR, (FRAME)0);
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
DestroyDrawable (ReleaseDrawable (pMS->CurFrame)); DestroyDrawable (ReleaseDrawable (pMS->CurFrame));