Merge branch 'master' into MusicalProgrammer

2018-05-30 21:19:46 -04:00
parent cd0f1617cb
commit 828c0dcb41
16 changed files with 599 additions and 483 deletions
--- a/AudioPlayer.cpp
+++ b/AudioPlayer.cpp
@@ -32,7 +32,6 @@ void AudioPlayer::init()
    /* Open the audio device and start playing sound! */
    if ( SDL_OpenAudio(&fmt, NULL) < 0 ) {
        fprintf(stderr, "Unable to open audio: %s\n", SDL_GetError());
-        exit(1);
    }
    SDL_PauseAudio(0);
 }
@@ -58,7 +57,7 @@ void mixaudio(void *unused, Uint8 *stream, int len)
    }
 }

-void AudioPlayer::PlaySound(std::string fileString)
+void AudioPlayer::playSound(std::string fileString)
 {

 	if(initiated)