projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix cmake download path
[supertux.git]
/
src
/
object
/
ambient_sound.cpp
diff --git
a/src/object/ambient_sound.cpp
b/src/object/ambient_sound.cpp
index
14539e6
..
e7474e6
100644
(file)
--- a/
src/object/ambient_sound.cpp
+++ b/
src/object/ambient_sound.cpp
@@
-27,7
+27,6
@@
#include "util/reader.hpp"
AmbientSound::AmbientSound(const Reader& lisp) :
#include "util/reader.hpp"
AmbientSound::AmbientSound(const Reader& lisp) :
- name(),
position(),
dimension(),
sample(),
position(),
dimension(),
sample(),
@@
-41,7
+40,6
@@
AmbientSound::AmbientSound(const Reader& lisp) :
currentvolume(),
volume_ptr()
{
currentvolume(),
volume_ptr()
{
- name="";
position.x = 0;
position.y = 0;
position.x = 0;
position.y = 0;
@@
-51,7
+49,6
@@
AmbientSound::AmbientSound(const Reader& lisp) :
distance_factor = 0;
distance_bias = 0;
maximumvolume = 1;
distance_factor = 0;
distance_bias = 0;
maximumvolume = 1;
- sample = "";
currentvolume = 0;
if (!(lisp.get("x", position.x)&&lisp.get("y", position.y))) {
currentvolume = 0;
if (!(lisp.get("x", position.x)&&lisp.get("y", position.y))) {
@@
-94,10
+91,9
@@
AmbientSound::AmbientSound(const Reader& lisp) :
}
AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file) :
}
AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file) :
- name(),
position(),
dimension(),
position(),
dimension(),
- sample(),
+ sample(
file
),
sound_source(),
latency(),
distance_factor(),
sound_source(),
latency(),
distance_factor(),
@@
-117,7
+113,6
@@
AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
distance_factor=factor*factor;
distance_bias=bias*bias;
maximumvolume=vol;
distance_factor=factor*factor;
distance_bias=bias*bias;
maximumvolume=vol;
- sample=file;
// set default silence_distance
// set default silence_distance