zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Fix MIDI music

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8271 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/config.cpp
#	source/sw/src/config.h
#	source/sw/src/game.cpp
#	source/sw/src/menus.cpp
#	source/sw/src/sounds.cpp
This commit is contained in:
hendricks266 2019-10-30 05:51:53 +00:00 committed by Christoph Oelckers
parent dcba445f4e
commit d679603cab
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/sw/src/game.cpp
View file

@ -273,6 +273,7 @@ void BOT_DeleteAllBots(void);
void BotPlayerInsert(PLAYERp pp);
void SybexScreen(void);
void DosScreen(void);
void PlayTheme(void);
void MenuLevel(void);
void StatScreen(PLAYERp mpp);
void InitRunLevel(void);
@ -1599,13 +1600,19 @@ NewLevel(void)
if (SW_SHAREWARE)
{
if (FinishAnim)
{
PlayTheme();
MenuLevel();
}
}
else
{
if (FinishAnim == ANIM_ZILLA || FinishAnim == ANIM_SERP)
{
PlayTheme();
MenuLevel();
}
}
FinishAnim = 0;
}
@ -1656,6 +1663,15 @@ ResetKeyRange(uint8_t* kb, uint8_t* ke)
}
}
void PlayTheme()
{
// start music at logo
strcpy(LevelSong,"theme.mid");
PlaySong(LevelSong, RedBookSong[0], TRUE, TRUE);
DSPRINTF(ds,"After music stuff...");
MONO_PRINT(ds);
}
void
LogoLevel(void)
@ -1679,13 +1695,6 @@ LogoLevel(void)
DSPRINTF(ds,"Created palookup...");
MONO_PRINT(ds);
// start music at logo
strcpy(LevelSong,"theme.mid");
PlaySong(LevelSong, RedBookSong[0], TRUE, TRUE);
DSPRINTF(ds,"After music stuff...");
MONO_PRINT(ds);
//GetPaletteFromVESA(pal);
//memcpy(backup_pal, pal, PAL_SIZE);
@ -2055,11 +2064,6 @@ MenuLevel(void)
DSPRINTF(ds,"MenuLevel...");
MONO_PRINT(ds);
if (MusicEnabled())
{
PlaySong(NULL, RedBookSong[0], TRUE, FALSE);
}
if (AutoNet)
{
DrawMenuLevelScreen();
@ -2822,6 +2826,7 @@ GameIntro(void)
PlayTheme();
if (!AutoNet)
{