eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 03:09:18 +02:00
Code Issues 121 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-06-30 18:45:58 +02:00
parent 76bb4be325 30e31cdfd0
commit dc584c140e
37 changed files with 672 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
simulation.cpp
View File

@@ -450,10 +450,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad
if( false == simulation::Memory.insert( memorycell ) ) {
ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
}
/*
// TODO: implement this
simulation::Region.insert_memorycell( memorycell, Scratchpad );
*/
simulation::Region->insert_memorycell( memorycell, Scratchpad );
}
else if( nodedata.type == "eventlauncher" ) {