FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some warnings for MSVC

Browse Source 
don't start to play sounds that are out of range of the listener
This commit is contained in:
Harald JOHNSEN
2012-06-08 15:23:54 +02:00
committed by ThorstenB
parent 3f6f34e7e1
commit aae77a7983
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/tgdb/SGTexturedTriangleBin.hxx
+1 -1
View File
@@ -293,7 +293,7 @@ public:
points.push_back(std::make_pair(randomPoint, img->getColor(x,y).r())); points.push_back(std::make_pair(randomPoint, img->getColor(x,y).r()));
} }
} else { } 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; num -= 1.0;
simgear/sound/sample_group.cxx
+1 -1
View File
@@ -134,7 +134,7 @@ void SGSampleGroup::update( double dt ) {
for ( ; sample_current != sample_end; ++sample_current ) { for ( ; sample_current != sample_end; ++sample_current ) {
SGSoundSample *sample = sample_current->second; 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. // a request to start playing a sound has been filed.
// //