eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 15:59:18 +02:00
Code Issues 124 Wiki Activity

Merge branch 'milek-dev' into udpnetwork

Browse Source
This commit is contained in:
milek7
2019-01-01 00:42:39 +01:00
parent 030d137f29 8802b34e0e
commit 3fae421ecf
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Globals.cpp
View File

@@ -308,7 +308,17 @@ global_settings::ConfigParse(cParser &Parser) {
else if( token == "scenario.time.override" ) { else if( token == "scenario.time.override" ) {
// shift (in hours) applied to train timetables // shift (in hours) applied to train timetables
Parser.getTokens( 1, false ); Parser.getTokens( 1, false );
Parser >> ScenarioTimeOverride; std::string token;
Parser >> token;
std::istringstream stream(token);
if (token.find(':')) {
float a, b;
char s;
stream >> a >> s >> b;
ScenarioTimeOverride = a + b / 60.0;
}
else
stream >> ScenarioTimeOverride;
ScenarioTimeOverride = clamp( ScenarioTimeOverride, 0.f, 24 * 1439 / 1440.f ); ScenarioTimeOverride = clamp( ScenarioTimeOverride, 0.f, 24 * 1439 / 1440.f );
} }
else if( token == "scenario.time.offset" ) { else if( token == "scenario.time.offset" ) {