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

Fix a spinlock in the final Melee score screen (Bug 879)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2312 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2006-04-19 03:50:07 +00:00
parent 9c38ba9aee
commit 08b17f49e8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.6: Changes towards version 0.6:
- Fixed a spinlock in Melee's final score screen (Bug 879) - Michael
- Phase 2 of online keyconfig - Setup Menu can configure assignment of - Phase 2 of online keyconfig - Setup Menu can configure assignment of
templates to players - Michael templates to players - Michael
- Control scheme shifted to Menus + Control Templates in preparation for - Control scheme shifted to Menus + Control Templates in preparation for
sc2/src/sc2code/pickmele.c
+3 -1
View File
@@ -315,9 +315,11 @@ GetMeleeStarShip (STARSHIPPTR LastStarShipPtr, COUNT which_player)
PressState = ButtonState; PressState = ButtonState;
ButtonState = FALSE; ButtonState = FALSE;
} }
TaskSwitch ();
} while (!(GLOBAL (CurrentActivity) & CHECK_ABORT) && (!ButtonState } while (!(GLOBAL (CurrentActivity) & CHECK_ABORT) && (!ButtonState
&& (!(PlayerControl[0] & PlayerControl[1] & PSYTRON_CONTROL) && (!(PlayerControl[0] & PlayerControl[1] & PSYTRON_CONTROL)
|| (TaskSwitch (), GetTimeCounter ()) < TimeOut))); || GetTimeCounter () < TimeOut)));
LockMutex (GraphicsLock); LockMutex (GraphicsLock);