eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

build 200914. articulated coupler parameters change, driver aid logic tweak, sound overrides support, combined rain sound support

Browse Source
This commit is contained in:
tmj-fstate
2020-09-20 17:22:04 +02:00
parent ac1253826f
commit 4da87e98d9
15 changed files with 122 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
simulationenvironment.cpp
View File

@@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/.
#include "stdafx.h"
#include "simulationenvironment.h"
#include "simulationsounds.h"
#include "Globals.h"
#include "Timer.h"
@@ -78,7 +79,14 @@ world_environment::init() {
m_stars.init();
m_clouds.Init();
m_precipitation.init();
m_precipitationsound.deserialize( "rain-sound-loop", sound_type::single );
{
auto const rainsoundoverride { simulation::Sound_overrides.find( "weather.rainsound:" ) };
m_rainsound.deserialize(
( rainsoundoverride != simulation::Sound_overrides.end() ?
rainsoundoverride->second :
"rain-sound-loop" ),
sound_type::single );
}
m_wind = basic_wind{
static_cast<float>( Random( 0, 360 ) ),
static_cast<float>( Random( -5, 5 ) ),
@@ -181,10 +189,13 @@ world_environment::update() {
if( ( true == ( FreeFlyModeFlag || Global.CabWindowOpen ) )
&& ( Global.Weather == "rain:" ) ) {
m_precipitationsound.play( sound_flags::exclusive | sound_flags::looping );
if( m_rainsound.is_combined() ) {
m_rainsound.pitch( Global.Overcast - 1.0 );
}
m_rainsound.play( sound_flags::exclusive | sound_flags::looping );
}
else {
m_precipitationsound.stop();
m_rainsound.stop();
}
update_wind();