remove some warnings for MSVC

don't start to play sounds that are out of range of the listener

diff --git a/simgear/scene/tgdb/SGTexturedTriangleBin.hxx b/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
index 5de1b5cc3699186f383b05edb65a4d9d24b3f5e3..9404e437ef4a567e1bfef4f9e9f17491768424b9 100644 (file)
--- a/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
+++ b/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
@@ -293,7 +293,7 @@ public:
               points.push_back(std::make_pair(randomPoint, img->getColor(x,y).r()));
             }
           } else {
-            points.push_back(std::make_pair(randomPoint, mt_rand(&seed)));
+            points.push_back(std::make_pair(randomPoint, static_cast<float>(mt_rand(&seed))));
           }        
         }
         num -= 1.0;

diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx
index b0ddab8a8ec357ca67131a290624bcd79dbb27c6..6b2d8566e3a8da6664916e32b4bd134f8969e400 100644 (file)
--- a/simgear/sound/sample_group.cxx
+++ b/simgear/sound/sample_group.cxx
@@ -134,7 +134,7 @@ void SGSampleGroup::update( double dt ) {
     for ( ; sample_current != sample_end; ++sample_current ) {
         SGSoundSample *sample = sample_current->second;
 
-        if ( !sample->is_valid_source() && sample->is_playing() ) {
+        if ( !sample->is_valid_source() && sample->is_playing() && !sample->test_out_of_range()) {
             //
             // a request to start playing a sound has been filed.
             //