From 8802b34e0eed7df74287d711152e7a8c3f96c9c3 Mon Sep 17 00:00:00 2001 From: milek7 Date: Tue, 1 Jan 2019 00:41:57 +0100 Subject: [PATCH] accept hh:mm in scenario.time.override --- Globals.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Globals.cpp b/Globals.cpp index 4c44d492..4a461483 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -308,7 +308,17 @@ global_settings::ConfigParse(cParser &Parser) { else if( token == "scenario.time.override" ) { // shift (in hours) applied to train timetables 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 ); } else if( token == "scenario.time.offset" ) {