X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faudio%2Fsound_manager.cpp;h=9d2883e3d237a13f09ac04bfd34cebfa611a1c57;hb=51bbae5942895f6efdd36a7ff3ae28ce897fb3c0;hp=c7e624aee92d5e0ecc871a7ea306a0ab81821de2;hpb=9e89407a97c5dfb035192387121e6102bc45a8fc;p=supertux.git diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp index c7e624aee..9d2883e3d 100644 --- a/src/audio/sound_manager.cpp +++ b/src/audio/sound_manager.cpp @@ -20,18 +20,15 @@ #include #include +#include #include #include #include "audio/sound_manager.h" #include "audio/musicref.h" -#include "app/globals.h" -#include "app/setup.h" #include "moving_object.h" #include "resources.h" -using namespace SuperTux; - SoundManager::SoundManager() : current_music(0), m_music_enabled(true) , m_sound_enabled(true), audio_device(false) @@ -85,7 +82,7 @@ SoundManager::play_sound(const std::string& sound, const Vector& pos, // TODO make sure this formula is good float distance = pos2.x- pos.x; - int loud = int(255.0/float(SCREEN_WIDTH*2) * fabsf(distance)); + int loud = int(255.0/float(1600) * fabsf(distance)); if(loud > 255) return;