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

Resolve conflicts for merge

Browse Source
This commit is contained in:
Hirek
2025-09-04 20:27:45 +02:00
parent 311a827ade 6b21737ec4
commit 072165aae3
7 changed files with 631 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Globals.cpp
View File

@@ -673,6 +673,12 @@ global_settings::ConfigParse(cParser &Parser) {
Parser >> token;
iPause |= (token == "yes" ? 1 : 0);
}
else if (token == "priorityloadtext3d")
{
Parser.getTokens(1);
Parser >> token;
priorityLoadText3D = (token == "yes" ? true : false);
}
else if (token == "lang")
{
// domyślny język - http://tools.ietf.org/html/bcp47
@@ -1371,6 +1377,7 @@ global_settings::export_as_text( std::ostream &Output ) const {
export_as_text( Output, "joinduplicatedevents", bJoinEvents );
export_as_text( Output, "hiddenevents", iHiddenEvents );
export_as_text( Output, "pause", ( iPause & 1 ) != 0 );
export_as_text(Output, "priorityLoadText3D", priorityLoadText3D);
export_as_text( Output, "lang", asLang );
export_as_text( Output, "python.updatetime", PythonScreenUpdateRate );
Output