From 79d3083dfcd3f1ac4ea3487ce0ea8813ef89720f Mon Sep 17 00:00:00 2001 From: avolkov Date: Wed, 18 Nov 2009 01:57:06 +0000 Subject: [PATCH] PlayingTrack() is now reliable enough that we do not need the extra hacky test git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3316 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/uqm/util.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sc2/src/uqm/util.c b/sc2/src/uqm/util.c index 2374ad17c..c4c6e17d3 100644 --- a/sc2/src/uqm/util.c +++ b/sc2/src/uqm/util.c @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commglue.h" #include "controls.h" #include "util.h" #include "setup.h" @@ -161,7 +160,7 @@ PauseGame (void) GLOBAL (CurrentActivity) |= CHECK_PAUSE; - if (CommData.ConversationPhrases && PlayingTrack ()) + if (PlayingTrack ()) PauseTrack (); LockMutex (GraphicsLock); @@ -218,7 +217,7 @@ PauseGame (void) WaitForNoInput (ONE_SECOND / 4); FlushInput (); - if (CommData.ConversationPhrases && PlayingTrack ()) + if (PlayingTrack ()) ResumeTrack (); UnlockMutex (GraphicsLock); @@ -257,7 +256,7 @@ SleepGame (void) log_add (log_Debug, "Game is going to sleep"); - if (CommData.ConversationPhrases && PlayingTrack ()) + if (PlayingTrack ()) PauseTrack (); PauseMusic (); @@ -273,7 +272,7 @@ SleepGame (void) ResumeMusic (); - if (CommData.ConversationPhrases && PlayingTrack ()) + if (PlayingTrack ()) ResumeTrack (); UnlockMutex (GraphicsLock);