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

PlayingTrack() is now reliable enough that we do not need the extra hacky test

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3316 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-11-18 01:57:06 +00:00
parent 963a6fb808
commit 79d3083dfc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/util.c
+4 -5
View File
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "commglue.h"
#include "controls.h" #include "controls.h"
#include "util.h" #include "util.h"
#include "setup.h" #include "setup.h"
@@ -161,7 +160,7 @@ PauseGame (void)
GLOBAL (CurrentActivity) |= CHECK_PAUSE; GLOBAL (CurrentActivity) |= CHECK_PAUSE;
if (CommData.ConversationPhrases && PlayingTrack ()) if (PlayingTrack ())
PauseTrack (); PauseTrack ();
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
@@ -218,7 +217,7 @@ PauseGame (void)
WaitForNoInput (ONE_SECOND / 4); WaitForNoInput (ONE_SECOND / 4);
FlushInput (); FlushInput ();
if (CommData.ConversationPhrases && PlayingTrack ()) if (PlayingTrack ())
ResumeTrack (); ResumeTrack ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
@@ -257,7 +256,7 @@ SleepGame (void)
log_add (log_Debug, "Game is going to sleep"); log_add (log_Debug, "Game is going to sleep");
if (CommData.ConversationPhrases && PlayingTrack ()) if (PlayingTrack ())
PauseTrack (); PauseTrack ();
PauseMusic (); PauseMusic ();
@@ -273,7 +272,7 @@ SleepGame (void)
ResumeMusic (); ResumeMusic ();
if (CommData.ConversationPhrases && PlayingTrack ()) if (PlayingTrack ())
ResumeTrack (); ResumeTrack ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);