Don't use floats where ints are more appropriate

[simgear.git] / simgear / sound / sound.cxx

diff --git a/simgear/sound/sound.cxx b/simgear/sound/sound.cxx
index a5ac675bfc268b325a0fadf32bf1aacc80120cfc..8ceaf18251de063a862b9ff71d25e7d44c9e1944 100644 (file)
--- a/simgear/sound/sound.cxx
+++ b/simgear/sound/sound.cxx
@@ -32,6 +32,7 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/props/condition.hxx>
+#include <simgear/math/fastmath.hxx>
 
 
 #include "sound.hxx"
@@ -41,10 +42,10 @@
 static double _snd_inv(double v)   { return (v == 0) ? 1e99 : 1/v; }
 static double _snd_abs(double v)   { return (v >= 0) ? v : -v; }
 static double _snd_sqrt(double v)  { return (v < 0) ? sqrt(-v) : sqrt(v); }
-static double _snd_log10(double v) { return (v < 1) ? 0 : log10(v); }
-static double _snd_log(double v)   { return (v < 1) ? 0 : log(v); }
-// static double _snd_sqr(double v)   { return pow(v, 2); }
-// static double _snd_pow3(double v)  { return pow(v, 3); }
+static double _snd_log10(double v) { return (v < 1) ? 0 : fast_log10(v); }
+static double _snd_log(double v)   { return (v < 1) ? 0 : fast_log(v); }
+// static double _snd_sqr(double v)   { return v*v; }
+// static double _snd_pow3(double v)  { return v*v*v; }
 
 static const struct {
        char *name;
@@ -119,7 +120,7 @@ SGSound::init(SGPropertyNode *root, SGPropertyNode *node, SGSoundMgr *sndmgr,
    _property = root->getNode(node->getStringValue("property", ""), true);
    SGPropertyNode *condition = node->getChild("condition");
    if (condition != NULL)
-      _condition = fgReadCondition(root, condition);
+      _condition = sgReadCondition(root, condition);
 
    if (!_property && !_condition)
       SG_LOG(SG_GENERAL, SG_WARN,