diff --git a/Pontu/include/engine/AudioHandler.h b/Pontu/include/engine/AudioHandler.h index 21910ea..5bdab5e 100644 --- a/Pontu/include/engine/AudioHandler.h +++ b/Pontu/include/engine/AudioHandler.h @@ -104,11 +104,11 @@ AudioHandler newAudioHandler(int masterVol, int volMusic, int volSFX); * \brief Changes volume for the SFX. * \param[in] volSFX The new volume for the SFX. */ -void changeSFXVol(AudioHandler* ah, int volSFX); +int changeSFXVol(AudioHandler* ah, int volSFX); -void changeMusicVol(AudioHandler* ah, int volMusic); +int changeMusicVol(AudioHandler* ah, int volMusic); -void changeMasterVol(AudioHandler* ah, int masterVol); +int changeMasterVol(AudioHandler* ah, int masterVol); /** * \brief Frees the music and SFX, and un-initializes the audio. diff --git a/Pontu/src/engine/AudioHandler.c b/Pontu/src/engine/AudioHandler.c index bffb735..2286567 100644 --- a/Pontu/src/engine/AudioHandler.c +++ b/Pontu/src/engine/AudioHandler.c @@ -91,26 +91,29 @@ AudioHandler newAudioHandler(int masterVol, int volMusic, int volSFX) { return audioHandler; } -void changeMusicVol(AudioHandler* ah, int volMusic) { +int changeMusicVol(AudioHandler* ah, int volMusic) { if (volMusic > 10) volMusic = 10; if (volMusic < 0) volMusic = 0; ah->volMusic = volMusic; Mix_VolumeMusic(ah->volMusic * ah->masterVol); + return ah->volMusic; } -void changeSFXVol(AudioHandler* ah, int volSFX) { +int changeSFXVol(AudioHandler* ah, int volSFX) { if (volSFX > 10) volSFX = 10; if (volSFX < 0) volSFX = 0; ah->volSFX = volSFX; Mix_Volume(-1, ah->volSFX * ah->masterVol); + return ah->volSFX; } -void changeMasterVol(AudioHandler* ah, int masterVol) { +int changeMasterVol(AudioHandler* ah, int masterVol) { if (masterVol > 10) masterVol = 10; if (masterVol < 0) masterVol = 0; ah->masterVol = masterVol; Mix_VolumeMusic(ah->volMusic * ah->masterVol); Mix_Volume(-1, ah->volSFX * ah->masterVol); + return ah->masterVol; } void freeAudioHandler(AudioHandler* audioHandler) {