projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Add Airship (regular above-ground theme) and Battle (castle/boss theme) music court...
[supertux.git]
/
src
/
object
/
ambient_sound.cpp
diff --git
a/src/object/ambient_sound.cpp
b/src/object/ambient_sound.cpp
index
d1169d2
..
8837f91
100644
(file)
--- a/
src/object/ambient_sound.cpp
+++ b/
src/object/ambient_sound.cpp
@@
-77,7
+77,7
@@
AmbientSound::AmbientSound(const lisp::Lisp& lisp)
// set default silence_distance
if (distance_factor == 0)
// set default silence_distance
if (distance_factor == 0)
- silence_distance = std::numeric_limits<float>::max();
+
silence_distance = std::numeric_limits<float>::max();
else
silence_distance = 1/distance_factor;
else
silence_distance = 1/distance_factor;
@@
-104,7
+104,7
@@
AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
// set default silence_distance
if (distance_factor == 0)
// set default silence_distance
if (distance_factor == 0)
- silence_distance = std::numeric_limits<float>::max();
+
silence_distance = std::numeric_limits<float>::max();
else
silence_distance = 1/distance_factor;
else
silence_distance = 1/distance_factor;
@@
-188,15
+188,15
@@
AmbientSound::update(float deltat)
sound_source->set_gain(currentvolume*maximumvolume);
if (sqrdistance>=silence_distance && currentvolume<1e-3)
sound_source->set_gain(currentvolume*maximumvolume);
if (sqrdistance>=silence_distance && currentvolume<1e-3)
- stop_playing();
+
stop_playing();
latency=0;
} else {
if (sqrdistance<silence_distance) {
latency=0;
} else {
if (sqrdistance<silence_distance) {
- start_playing();
- latency=0;
+
start_playing();
+
latency=0;
}
else // set a reasonable latency
}
else // set a reasonable latency
- latency=(int)(0.001/distance_factor);
+
latency=(int)(0.001/distance_factor);
//(int)(10*((sqrdistance-silence_distance)/silence_distance));
}
}
//(int)(10*((sqrdistance-silence_distance)/silence_distance));
}
}