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
5dc7cce
..
4c6e5d7
100644
(file)
--- a/
lib/audio/sound_manager.h
+++ b/
lib/audio/sound_manager.h
@@
-38,8
+38,7
@@
namespace SuperTux
NO_MUSIC,
LEVEL_MUSIC,
HURRYUP_MUSIC,
NO_MUSIC,
LEVEL_MUSIC,
HURRYUP_MUSIC,
- HERRING_MUSIC,
- CREDITS_MUSIC
+ HERRING_MUSIC
};
/// Sound manager
};
/// Sound manager
@@
-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);