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

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1653 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2005-04-19 10:30:35 +00:00
parent 29a3553f5e
commit ee79780c71
2 changed files with 9 additions and 0 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:
- Guard access to the Clock so that accessing it is a no-op when the game
isn't actually in progress (bug #678), from Nic
- Accept files with .uqm extension for packages (bug #558) - Accept files with .uqm extension for packages (bug #558)
Added regex fallback files. - SvdB Added regex fallback files. - SvdB
- Music volume normalized throughout the game (bug #718) -Alex - Music volume normalized throughout the game (bug #718) -Alex
sc2/src/sc2code/clock.c
+7
View File
@@ -212,6 +212,7 @@ UninitGameClock (void)
GLOBAL (GameClock.clock_task) = 0; GLOBAL (GameClock.clock_task) = 0;
} }
DestroyMutex (clock_mutex); DestroyMutex (clock_mutex);
clock_mutex = NULL;
UninitQueue (&GLOBAL (GameClock.event_q)); UninitQueue (&GLOBAL (GameClock.event_q));
@@ -221,6 +222,9 @@ UninitGameClock (void)
void void
SuspendGameClock (void) SuspendGameClock (void)
{ {
if (! clock_mutex)
return;
LockMutex (clock_mutex); LockMutex (clock_mutex);
if (GameClockRunning ()) if (GameClockRunning ())
{ {
@@ -233,6 +237,9 @@ SuspendGameClock (void)
void void
ResumeGameClock (void) ResumeGameClock (void)
{ {
if (! clock_mutex)
return;
LockMutex (clock_mutex); LockMutex (clock_mutex);
if (!GameClockRunning ()) if (!GameClockRunning ())
{ {