eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 13:29:18 +02:00
Code Issues 122 Wiki Activity

Merge branch 'mover_in_c++'

Browse Source
This commit is contained in:
tmj-fstate
2017-02-12 23:28:45 +01:00
parent 1b2b3b06e7 6683738077
commit 377d661e68
7 changed files with 172 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DynObj.cpp
View File

@@ -3986,25 +3986,32 @@ void TDynamicObject::RenderSounds()
else
rsSilnik.Stop();
}
enginevolume = (enginevolume + vol) / 2;
if (enginevolume < 0.01)
enginevolume = (enginevolume + vol) * 0.5;
if( enginevolume < 0.01 ) {
rsSilnik.Stop();
if ((MoverParameters->EngineType == ElectricSeriesMotor) ||
(MoverParameters->EngineType == ElectricInductionMotor) && rsWentylator.AM != 0)
}
if ( ( MoverParameters->EngineType == ElectricSeriesMotor )
|| ( MoverParameters->EngineType == ElectricInductionMotor )
&& ( rsWentylator.AM != 0 ) )
{
if (MoverParameters->RventRot > 0.1)
{
if (MoverParameters->RventRot > 0.1) {
// play ventilator sound if the ventilators are rotating fast enough...
freq = rsWentylator.FM * MoverParameters->RventRot + rsWentylator.FA;
rsWentylator.AdjFreq(freq, dt);
if (MoverParameters->EngineType == ElectricInductionMotor)
vol =
rsWentylator.AM * sqrt(fabs(MoverParameters->dizel_fill)) + rsWentylator.AA;
else
if( MoverParameters->EngineType == ElectricInductionMotor ) {
vol = rsWentylator.AM * std::sqrt( std::fabs( MoverParameters->dizel_fill ) ) + rsWentylator.AA;
}
else {
vol = rsWentylator.AM * MoverParameters->RventRot + rsWentylator.AA;
}
rsWentylator.Play(vol, DSBPLAY_LOOPING, MechInside, GetPosition());
}
else
else {
// ...otherwise shut down the sound
rsWentylator.Stop();
}
}
if (MoverParameters->TrainType == dt_ET40)
{