22.Jul.2009

git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@95 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
2009-07-22 16:38:10 +00:00
parent b45ce76900
commit 531ce04fa1
53 changed files with 7040 additions and 5553 deletions
@@ -12,6 +12,7 @@

 CMusic::CMusic() {
 	playmode = PLAY_MODE_STOP;
+	music_buffer = NULL;
 }

 CMusic::~CMusic() {
@@ -20,6 +21,8 @@ CMusic::~CMusic() {

 int CMusic::load(SDL_AudioSpec AudioSpec, char *musicfile)
 {
+	FILE *fp;
+
 	if(AudioSpec.format != 0)
 	{

@@ -33,10 +36,10 @@ int CMusic::load(SDL_AudioSpec AudioSpec, char *musicfile)
 	pOggAudio.sound_len=0;
 	pOggAudio.sound_pos=0;

-	FILE *fp;
 	if((fp = fopen(musicfile,"rb")) == NULL)
 	{
 		g_pLogFile->textOut(PURPLE,"Music Driver(): \"%s\". File does not exist!<br>", musicfile);
+
 		return -1;
 	}

@@ -101,7 +104,8 @@ void CMusic::unload(void)

 void CMusic::play(void)
 {
-	playmode = PLAY_MODE_PLAY;
+	if(music_buffer)
+		playmode = PLAY_MODE_PLAY;
 }

 void CMusic::stop(void)