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

Shipyard animations no longer hang the game

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@97 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2002-10-03 07:15:51 +00:00
parent e7224cb3c9
commit 4361372009
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/shipyard.c
+14 -6
View File
@@ -186,6 +186,7 @@ DrawRaceStrings (BYTE NewRaceItem)
#define SHIP_WIN_WIDTH 34 #define SHIP_WIN_WIDTH 34
#define SHIP_WIN_HEIGHT (SHIP_WIN_WIDTH + 6) #define SHIP_WIN_HEIGHT (SHIP_WIN_WIDTH + 6)
#define SHIP_WIN_FRAMES ((SHIP_WIN_WIDTH >> 1) + 1)
static void static void
ShowShipCrew (SHIP_FRAGMENTPTR StarShipPtr, PRECT pRect) ShowShipCrew (SHIP_FRAGMENTPTR StarShipPtr, PRECT pRect)
@@ -368,6 +369,7 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr)
DWORD TimeIn; DWORD TimeIn;
RECT r; RECT r;
CONTEXT OldContext; CONTEXT OldContext;
int j;
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
OldContext = SetContext (OffScreenContext); OldContext = SetContext (OffScreenContext);
@@ -380,10 +382,13 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr)
r.extent.height = SHIP_WIN_HEIGHT; r.extent.height = SHIP_WIN_HEIGHT;
ButtonState = AnyButtonPress (FALSE) ? 1 : 0; ButtonState = AnyButtonPress (FALSE) ? 1 : 0;
TimeIn = GetTimeCounter (); TimeIn = GetTimeCounter ();
do
for (j = 0; (j < SHIP_WIN_FRAMES) && !AllDoorsFinished; j++)
{ {
ClearSemaphore (GraphicsSem);
SleepThreadUntil (TimeIn + 5); SleepThreadUntil (TimeIn + 5);
TimeIn = GetTimeCounter (); TimeIn = GetTimeCounter ();
SetSemaphore (GraphicsSem);
BatchGraphics (); BatchGraphics ();
StartFinalPass: StartFinalPass:
pship_win_info = &ship_win_info[0]; pship_win_info = &ship_win_info[0];
@@ -399,8 +404,11 @@ StartFinalPass:
if (YankedStarShipPtr == 0) if (YankedStarShipPtr == 0)
AllDoorsFinished = TRUE; AllDoorsFinished = TRUE;
else else
{
pship_win_info->lfdoor_s.origin.x = pship_win_info->lfdoor_s.origin.x =
pship_win_info->rtdoor_s.origin.x = 0; pship_win_info->rtdoor_s.origin.x = 0;
AllDoorsFinished = TRUE;
}
goto StartFinalPass; goto StartFinalPass;
} }
@@ -436,7 +444,7 @@ StartFinalPass:
} }
UnbatchGraphics (); UnbatchGraphics ();
} while (!AllDoorsFinished); }
SetContextClipRect (NULL_PTR); SetContextClipRect (NULL_PTR);
SetContext (OldContext); SetContext (OldContext);
@@ -690,7 +698,7 @@ DoModifyShips (INPUT_STATE InputState, PMENU_STATE pMS)
goto ChangeFlashRect; goto ChangeFlashRect;
} }
else if (InputState & (DEVICE_BUTTON1 | DEVICE_BUTTON2)) else if (InputState & (DEVICE_BUTTON1 | DEVICE_BUTTON2))
{ {
if (!(pMS->delta_item ^= MODIFY_CREW_FLAG)) if (!(pMS->delta_item ^= MODIFY_CREW_FLAG))
goto ChangeFlashRect; goto ChangeFlashRect;
else if (hStarShip == 0) else if (hStarShip == 0)
@@ -837,10 +845,10 @@ DoModifyShips (INPUT_STATE InputState, PMENU_STATE pMS)
crew_bought -= crew_delta; crew_bought -= crew_delta;
} }
ResUnits += crew_bought * GLOBAL (CrewCost); ResUnits += crew_bought * GLOBAL (CrewCost);
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL_PTR, (FRAME)0);
ClearSemaphore (GraphicsSem); ClearSemaphore (GraphicsSem);
ShowCombatShip ((COUNT)pMS->CurState, StarShipPtr); ShowCombatShip ((COUNT)pMS->CurState, StarShipPtr);
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
pMS->flash_rect0.extent.width = SHIP_WIN_WIDTH; pMS->flash_rect0.extent.width = SHIP_WIN_WIDTH;
SetFlashRect (&pMS->flash_rect0, (FRAME)0); SetFlashRect (&pMS->flash_rect0, (FRAME)0);