projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved the zeekling into base
[supertux.git]
/
src
/
audio
/
sound_manager.cpp
diff --git
a/src/audio/sound_manager.cpp
b/src/audio/sound_manager.cpp
index
c7e624a
..
e463acc
100644
(file)
--- a/
src/audio/sound_manager.cpp
+++ b/
src/audio/sound_manager.cpp
@@
-20,18
+20,16
@@
#include <cmath>
#include <cassert>
#include <cmath>
#include <cassert>
+#include <iostream>
#include <stdexcept>
#include <sstream>
#include "audio/sound_manager.h"
#include <stdexcept>
#include <sstream>
#include "audio/sound_manager.h"
+
#include "audio/musicref.h"
#include "audio/musicref.h"
-#include "app/globals.h"
-#include "app/setup.h"
#include "moving_object.h"
#include "resources.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)
SoundManager::SoundManager()
: current_music(0), m_music_enabled(true) , m_sound_enabled(true),
audio_device(false)
@@
-46,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)
@@
-85,7
+84,7
@@
SoundManager::play_sound(const std::string& sound, const Vector& pos,
// TODO make sure this formula is good
float distance
= pos2.x- pos.x;
// 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;
if(loud > 255)
return;