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

Merge branch 'gfx-work' into udpnetwork

Browse Source
This commit is contained in:
milek7
2019-01-19 19:51:54 +01:00
parent a818810d24 e976c452d2
commit 84153aac80
8 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Train.cpp
View File

@@ -6472,7 +6472,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName)
rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax );
rsRunningNoise.owner( DynamicObject );
rsRunningNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax );
// rsRunningNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax );
rsRunningNoise.m_frequencyfactor /= ( 1 + mvOccupied->Vmax );
}
else if( token == "huntingnoise:" ) {
@@ -6480,7 +6480,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName)
rsHuntingNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax );
rsHuntingNoise.owner( DynamicObject );
rsHuntingNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax );
// rsHuntingNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax );
rsHuntingNoise.m_frequencyfactor /= ( 1 + mvOccupied->Vmax );
}
@@ -7406,7 +7406,7 @@ void TTrain::set_cab_controls( int const Cab ) {
if (ggBrakeOperationModeCtrl.SubModel != nullptr) {
ggBrakeOperationModeCtrl.PutValue(
(mvOccupied->BrakeOpModeFlag > 0 ?
log2(mvOccupied->BrakeOpModeFlag) :
std::log2(mvOccupied->BrakeOpModeFlag) :
0));
}
// alarm chain