projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't hardcode tilespath
[supertux.git]
/
src
/
audio
/
sound_manager.cpp
diff --git
a/src/audio/sound_manager.cpp
b/src/audio/sound_manager.cpp
index
9d2883e
..
e463acc
100644
(file)
--- a/
src/audio/sound_manager.cpp
+++ b/
src/audio/sound_manager.cpp
@@
-25,6
+25,7
@@
#include <sstream>
#include "audio/sound_manager.h"
#include <sstream>
#include "audio/sound_manager.h"
+
#include "audio/musicref.h"
#include "moving_object.h"
#include "resources.h"
#include "audio/musicref.h"
#include "moving_object.h"
#include "resources.h"
@@
-43,20
+44,21
@@
SoundManager::~SoundManager()
sounds.clear();
}
sounds.clear();
}
-void
-SoundManager::play_sound(const std::string& name)
+int
+SoundManager::play_sound(const std::string& name
,int loops
)
{
if(!audio_device || !m_sound_enabled)
{
if(!audio_device || !m_sound_enabled)
- return;
+ return
-1
;
Mix_Chunk* chunk = preload_sound(name);
if(chunk == 0) {
std::cerr << "Sound '" << name << "' not found.\n";
Mix_Chunk* chunk = preload_sound(name);
if(chunk == 0) {
std::cerr << "Sound '" << name << "' not found.\n";
- return;
+ return
-1
;
}
}
-
Mix_PlayChannel(-1, chunk, 0
);
+
return Mix_PlayChannel(-1, chunk, loops
);
}
}
+
void
SoundManager::play_sound(const std::string& sound, const MovingObject* object,
const Vector& pos)
void
SoundManager::play_sound(const std::string& sound, const MovingObject* object,
const Vector& pos)