eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

further WIP on launcher

Browse Source
This commit is contained in:
milek7
2019-08-24 01:28:55 +02:00
parent ad58c617d4
commit aa9bee57da
20 changed files with 225 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
simulationstateserializer.cpp
View File

@@ -643,14 +643,27 @@ state_serializer::deserialize_time( cParser &Input, scene::scratch_data &Scratch
void
state_serializer::deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ) {
int line = Input.LineMain();
if (line != -1) {
for (const std::pair<int, std::string> &entry : Global.trainset_overrides) {
if (line != entry.first)
continue;
skip_until(Input, "endtrainset");
Input.injectString(entry.second);
return;
}
}
if( true == Scratchpad.trainset.is_open ) {
// shouldn't happen but if it does wrap up currently open trainset and report an error
deserialize_endtrainset( Input, Scratchpad );
ErrorLog( "Bad scenario: encountered nested trainset definitions in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() ) + ")" );
}
Scratchpad.trainset = scene::scratch_data::trainset_data();
Scratchpad.trainset.is_open = true;
Scratchpad.trainset = scene::scratch_data::trainset_data();
Scratchpad.trainset.is_open = true;
Input.getTokens( 4 );
Input