projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updating Nolok/dummy-guy image placeholder
[supertux.git]
/
lib
/
audio
/
sound_manager.h
diff --git
a/lib/audio/sound_manager.h
b/lib/audio/sound_manager.h
index
f5cfb30
..
4c6e5d7
100644
(file)
--- a/
lib/audio/sound_manager.h
+++ b/
lib/audio/sound_manager.h
@@
-25,7
+25,7
@@
#include <map>
#include "SDL_mixer.h"
#include <map>
#include "SDL_mixer.h"
-#include "
../
math/vector.h"
+#include "math/vector.h"
namespace SuperTux
{
namespace SuperTux
{
@@
-47,7
+47,6
@@
namespace SuperTux
class SoundManager
{
public:
class SoundManager
{
public:
-
/// Play sound.
void play_sound(Mix_Chunk* sound);
/// Play sound relative to two Vectors.
/// Play sound.
void play_sound(Mix_Chunk* sound);
/// Play sound relative to two Vectors.
@@
-60,7
+59,7
@@
namespace SuperTux
MusicRef load_music(const std::string& file);
/// Load sound.
MusicRef load_music(const std::string& file);
/// Load sound.
- Mix_Chunk
* load_sound(const std::string& file);
+ Mix_Chunk* load_sound(const std::string& file);
/// Test if a certain music file exists.
bool exists_music(const std::string& filename);
/// Test if a certain music file exists.
bool exists_music(const std::string& filename);
@@
-161,7
+160,6
@@
namespace SuperTux
bool m_music_enabled;
bool m_sound_enabled;
bool audio_device; /* != 0: available and initialized */
bool m_music_enabled;
bool m_sound_enabled;
bool audio_device; /* != 0: available and initialized */
-
};
Mix_Chunk* IDToSound(int id);
};
Mix_Chunk* IDToSound(int id);