16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 06:49:19 +02:00

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2019-05-23 23:02:34 +02:00
26 changed files with 726 additions and 356 deletions

View File

@@ -132,7 +132,13 @@ global_settings::ConfigParse(cParser &Parser) {
// selected device for audio renderer
Parser.getTokens();
Parser >> AudioVolume;
AudioVolume = clamp( AudioVolume, 0.0f, 2.f );
AudioVolume = clamp( AudioVolume, 0.f, 2.f );
}
else if( token == "sound.volume.radio" ) {
// selected device for audio renderer
Parser.getTokens();
Parser >> RadioVolume;
RadioVolume = clamp( RadioVolume, 0.f, 1.f );
}
else if (token == "sound.maxsources") {
Parser.getTokens();