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

Skipping bay door animations works properly now (bug #500), from chmmravatar

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1303 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2003-12-14 15:47:32 +00:00
parent 214298e9b0
commit b7152e3ee5
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.4: Changes towards version 0.4:
- Bay door animations don't stall before aborting (bug #500), from
chmmravatar
- Reports SDL version on startup (bug #520) - Mika,Nic - Reports SDL version on startup (bug #520) - Mika,Nic
- Fuel usage on planet landing is now reported correctly on all situations - Fuel usage on planet landing is now reported correctly on all situations
(bug #556), from Nic (bug #556), from Nic
sc2/src/sc2code/shipyard.c
+1 -12
View File
@@ -459,7 +459,6 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr)
if (num_ships) if (num_ships)
{ {
BYTE ButtonState;
BOOLEAN AllDoorsFinished; BOOLEAN AllDoorsFinished;
DWORD TimeIn; DWORD TimeIn;
RECT r; RECT r;
@@ -471,15 +470,7 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr)
r.corner.x = r.corner.y = 0; r.corner.x = r.corner.y = 0;
r.extent.width = SHIP_WIN_WIDTH; r.extent.width = SHIP_WIN_WIDTH;
r.extent.height = SHIP_WIN_HEIGHT; r.extent.height = SHIP_WIN_HEIGHT;
ButtonState = AnyButtonPress (FALSE) ? 1 : 0; FlushInput ();
if (ButtonState)
{
while (ButtonState)
if (!AnyButtonPress (FALSE))
ButtonState = 0;
else
TaskSwitch();
}
TimeIn = GetTimeCounter (); TimeIn = GetTimeCounter ();
for (j = 0; (j < SHIP_WIN_FRAMES) && !AllDoorsFinished; j++) for (j = 0; (j < SHIP_WIN_FRAMES) && !AllDoorsFinished; j++)
@@ -494,8 +485,6 @@ ShowCombatShip (COUNT which_window, SHIP_FRAGMENTPTR YankedStarShipPtr)
ship_win_info[0].rtdoor_s.origin.x = 0; ship_win_info[0].rtdoor_s.origin.x = 0;
} }
AllDoorsFinished = TRUE; AllDoorsFinished = TRUE;
while (AnyButtonPress (FALSE))
TaskSwitch();
} }
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
OldContext = SetContext (OffScreenContext); OldContext = SetContext (OffScreenContext);