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-01-14 23:31:26 +01:00
14 changed files with 226 additions and 180 deletions

View File

@@ -374,6 +374,14 @@ global_settings::ConfigParse(cParser &Parser) {
Parser.getTokens();
Parser >> ResourceMove;
}
else if( token == "gfx.reflections.framerate" ) {
auto const updatespersecond { std::abs( Parser.getToken<double>() ) };
ReflectionUpdatesPerSecond = (
updatespersecond > 0 ?
1000 / std::min( 30.0, updatespersecond ) :
0 );
}
else if (token == "timespeed")
{
// przyspieszenie czasu, zmienna do testów