eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-30 16:40:28 +01:00
Code Issues 154 Wiki Activity

start without scenery flag

Browse Source
This commit is contained in:
maj00r
2026-09-13 12:44:48 +02:00
parent 61336a0660
commit 3bdd5d8e90
4 changed files with 125 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
simulation/simulationstateserializer.cpp
View File

@@ -76,8 +76,16 @@ state_serializer::deserialize_begin( std::string const &Scenariofile ) {
}
scene::Groups.create();
if( false == state->input.ok() )
throw invalid_scenery_exception();
if( false == state->input.ok() ) {
if( false == Global.editor_startup ) {
throw invalid_scenery_exception();
}
// the editor is allowed to work on ground that has no scenery file yet: starting with -editor,
// or beginning a new map, names a file which will only exist once it gets saved. an unreadable
// scenery means an empty world here, not a failed load
WriteLog( "Scenery \"" + Scenariofile + "\" not found, the editor starts on empty ground" );
state->blank = true;
}
// prepare deserialization function table
// since all methods use the same objects, we can have simple, hard-coded binds or lambdas for the task
@@ -164,6 +172,7 @@ state_serializer::deserialize_continue(std::shared_ptr<deserializer_state> state
if( true == Global.file_binary_terrain
&& false == state->scratchpad.binary.terrain
&& false == state->blank
&& state->scenariofile != "$.scn" ) {
// if we didn't find usable binary version of the scenario files, create them now for future use
// as long as the scenario file wasn't rainsted-created base file override

2
simulation/simulationstateserializer.h
View File

@@ -16,6 +16,8 @@ namespace simulation {
struct deserializer_state {
std::string scenariofile;
// the named scenery has no file on disk: the world is empty, so there's nothing to compile to SBT
bool blank{ false };
cParser input;
scene::scratch_data scratchpad;
using deserializefunctionbind = std::function<void()>;