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

prepend_scn feature

Browse Source
This commit is contained in:
milek7
2020-10-31 01:19:37 +01:00
parent f042eaf6b4
commit c9169edf72
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -12,7 +12,7 @@ set(DEPS_DIR ${DEPS_DIR} "${CMAKE_SOURCE_DIR}/ref")
project("eu07") project("eu07")
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined -Wformat")
#set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -fsanitize=address -fsanitize=undefined") #set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -fsanitize=address -fsanitize=undefined")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)

4
Globals.cpp
View File

@@ -1166,6 +1166,10 @@ global_settings::ConfigParse(cParser &Parser) {
Parser.getTokens(1); Parser.getTokens(1);
Parser >> map_manualswitchcontrol; Parser >> map_manualswitchcontrol;
} }
else if (token == "prepend_scn") {
Parser.getTokens(1);
Parser >> prepend_scn;
}
/* /*
else if (token == "crashdamage") { else if (token == "crashdamage") {
Parser.getTokens(1); Parser.getTokens(1);

1
Globals.h
View File

@@ -258,6 +258,7 @@ struct global_settings {
float map_highlight_distance = 3000.0f; float map_highlight_distance = 3000.0f;
std::string exec_on_exit; std::string exec_on_exit;
std::string prepend_scn;
struct extraviewport_config { struct extraviewport_config {
std::string monitor; std::string monitor;

4
simulationstateserializer.cpp
View File

@@ -91,6 +91,10 @@ state_serializer::deserialize_begin( std::string const &Scenariofile ) {
state->functionmap.emplace( function.first, std::bind( function.second, this, std::ref( state->input ), std::ref( state->scratchpad ) ) ); state->functionmap.emplace( function.first, std::bind( function.second, this, std::ref( state->input ), std::ref( state->scratchpad ) ) );
} }
if (!Global.prepend_scn.empty()) {
state->input.injectString(Global.prepend_scn);
}
return state; return state;
} }