TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Only stop music at jukebox_stop() if MIDI jukebox_loaded - otherwise user can stop Jukebox with keys but not start it again

Browse source
This commit is contained in:
zicodxx 2008-06-01 22:33:21 +00:00
parent 3d1e2ed850
commit 057523af2c
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.txt
View file

@ -1,5 +1,13 @@
D2X-Rebirth Changelog D2X-Rebirth Changelog
20080602
--------
arch/sdl/jukebox.c: Only stop music at jukebox_stop() if MIDI jukebox_loaded - otherwise user can stop Jukebox with keys but not start it again
20080601
--------
include/args.h, main/inferno.c, main/hud.c, main/game.c, main/gamecntl.c, misc/args.c, d2x.ini, README.txt, arch/sdl/digi_mixer.c, arch/sdl/digi_mixer_music.c, arch/sdl/digi_audio.c, arch/win32/include/hmpfile.h, arch/win32/hmpfile.c: Using Windows code to play HMP files on Windows build; Fixed Jukebox keys in help screen; Allow -noredundancy in Singleplayer; Fixed processing of Console keys if Console is not active; Added Multiplayer hints to README; Made INI wrapping safer and more accurate
20080528 20080528
-------- --------
arch/sdl/rbaudio.c, main/songs.c: allow an audio CD to be played if it's inserted after D2X is launched, hopefully find the first audio CD if multiple CDs are inserted arch/sdl/rbaudio.c, main/songs.c: allow an audio CD to be played if it's inserted after D2X is launched, hopefully find the first audio CD if multiple CDs are inserted

2
arch/sdl/jukebox.c
View file

@ -141,7 +141,7 @@ void jukebox_play(int loop) {
} }
void jukebox_stop() { void jukebox_stop() {
//if (!jukebox_loaded) return; // since this function is also used for stopping MIDI if (!jukebox_loaded) return; // since this function is also used for stopping MIDI
mix_stop_music(); mix_stop_music();
if (jukebox_playing) if (jukebox_playing)
hud_message(MSGC_GAME_FEEDBACK, JUKEBOX_HUDMSG_STOPPED); hud_message(MSGC_GAME_FEEDBACK, JUKEBOX_HUDMSG_STOPPED);