From 8232957994d5863cd54094ec375bb9421902b81d Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 7 Feb 2008 09:37:12 +0000
Subject: [PATCH] - Enabled music in windowed mode (was missing in windowed
 mode)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Utils/Music Control.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Utils/Music Control.cpp b/Utils/Music Control.cpp
index d4fc55bc..80060bf3 100644
--- a/Utils/Music Control.cpp	
+++ b/Utils/Music Control.cpp	
@@ -99,8 +99,9 @@ void MusicStopCallback( void *pData );
 //********************************************************************************
 BOOLEAN MusicPlay(UINT32 uiNum)
 {
-  if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
-    return FALSE;
+	// WANNE: We want music in windowed mode
+  //if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
+  //  return FALSE;
 
   SOUNDPARMS spParms;	
 
@@ -144,8 +145,9 @@ BOOLEAN MusicSetVolume(UINT32 uiVolume)
 {
   INT32 uiOldMusicVolume = uiMusicVolume;
 
-  if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
-    return FALSE;
+  // WANNE: We want music in windowed mode
+  //if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
+  //  return FALSE;
 
   
   uiMusicVolume=__min(uiVolume, 127);
@@ -198,8 +200,9 @@ UINT32 MusicGetVolume(void)
 //********************************************************************************
 BOOLEAN MusicStop(void)
 {
-  if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
-  	return(FALSE);
+	// WANNE: We want music in windowed mode
+  //if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
+  //	return(FALSE);
 
 
 	if(uiMusicHandle!=NO_SAMPLE)
@@ -265,8 +268,9 @@ BOOLEAN MusicPoll( BOOLEAN fForce )
 {
 	//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"MusicPoll");
 
-  if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
-  	return(TRUE);
+	// WANNE: We want music in windowed mode
+  //if( 1==iScreenMode ) /* on Windowed mode, skip the music? was coded for WINDOWED_MODE that way...*/
+  	//return(TRUE);
 
 	INT32 iVol;