From a71c09f62f85389796da84cc53e46e696d396d46 Mon Sep 17 00:00:00 2001 From: cosmosninja Date: Tue, 11 Dec 2007 01:28:10 +0000 Subject: [PATCH] Fixed two bugs introduced in the last two commits, one disabled sound, and another wouldn't let plib-based sound compile; also introduced minor style improvements. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1339 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/sound_manager.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sound_manager.cpp b/src/sound_manager.cpp index 07ea4d2c9..f627349ed 100644 --- a/src/sound_manager.cpp +++ b/src/sound_manager.cpp @@ -65,7 +65,6 @@ SoundManager::SoundManager() } else m_initialized = true; - getcwd #else if(alutInit(0, NULL) == AL_TRUE) // init OpenAL sound system m_initialized = true; @@ -180,13 +179,15 @@ void SoundManager::playMusic(const char* filename) #endif if(m_current_music == NULL) // no support for file + { fprintf(stderr, "WARNING: music file %s format not recognized.\n", filename); return; + } - if((m_current_music->load(filename)) == false) + if((m_current_music->load(filename)) == false) { delete m_current_music; - m_current_music=0; + m_current_music=0; fprintf(stderr, "WARNING: Unabled to load music %s, not supported or not found.\n", filename); } else