1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Enabled music in windowed mode (was missing in windowed mode)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-02-07 09:37:12 +00:00
parent bb1b1eaf7e
commit 8232957994
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Music Control.cpp
+12 -8
View File
@@ -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;