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

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-01-01 19:02:57 +01:00
parent 1928e73ea2 04398e9fcf
commit 4d2d777737
6 changed files with 79 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DynObj.cpp
View File

@@ -4762,8 +4762,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName,
// szum podczas jazdy:
m_wheelflat.deserialize( parser, sound_type::single, sound_parameters::frequency );
m_wheelflat.owner( this );
m_wheelflat.m_amplitudefactor /= ( 1 + MoverParameters->Vmax );
}
} while( ( token != "" )
@@ -4926,8 +4924,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName,
if( true == m_wheelflat.empty() ) {
m_wheelflat.deserialize( "lomotpodkucia.wav 0.23 0.0", sound_type::single, sound_parameters::frequency );
m_wheelflat.owner( this );
m_wheelflat.m_amplitudefactor /= ( 1 + MoverParameters->Vmax );
}
if( true == rscurve.empty() ) {
// hunter-111211: domyslne, gdy brak