eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 02:49:19 +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; Parser >> token;
iPause |= (token == "yes" ? 1 : 0); iPause |= (token == "yes" ? 1 : 0);
} }
else if (token == "priorityloadtext3d")
{
Parser.getTokens(1);
Parser >> token;
priorityLoadText3D = (token == "yes" ? true : false);
}
else if (token == "lang") else if (token == "lang")
{ {
// domyślny język - http://tools.ietf.org/html/bcp47 // 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, "joinduplicatedevents", bJoinEvents );
export_as_text( Output, "hiddenevents", iHiddenEvents ); export_as_text( Output, "hiddenevents", iHiddenEvents );
export_as_text( Output, "pause", ( iPause & 1 ) != 0 ); export_as_text( Output, "pause", ( iPause & 1 ) != 0 );
export_as_text(Output, "priorityLoadText3D", priorityLoadText3D);
export_as_text( Output, "lang", asLang ); export_as_text( Output, "lang", asLang );
export_as_text( Output, "python.updatetime", PythonScreenUpdateRate ); export_as_text( Output, "python.updatetime", PythonScreenUpdateRate );
Output Output

1
Globals.h
View File

@@ -83,6 +83,7 @@ struct global_settings {
bool file_binary_terrain{ true }; // enable binary terrain (de)serialization bool file_binary_terrain{ true }; // enable binary terrain (de)serialization
bool file_binary_terrain_state{true}; bool file_binary_terrain_state{true};
// logs // logs
bool priorityLoadText3D{false}; // ladowanie T3D priorytetowo
int iWriteLogEnabled{ 3 }; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów int iWriteLogEnabled{ 3 }; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów
bool MultipleLogs{ false }; bool MultipleLogs{ false };
unsigned int DisabledLogTypes{ 0 }; unsigned int DisabledLogTypes{ 0 };

1
McZapkie/Mover.cpp
View File

@@ -11358,7 +11358,6 @@ void TMoverParameters::LoadFIZ_FFList( std::string const &Input ) {
extract_value( RlistSize, "Size", Input, "" ); extract_value( RlistSize, "Size", Input, "" );
} }
void TMoverParameters::LoadFIZ_WiperList(std::string const &Input) void TMoverParameters::LoadFIZ_WiperList(std::string const &Input)
{ {
extract_value(WiperListSize, "Size", Input, ""); extract_value(WiperListSize, "Size", Input, "");

27
Model3d.cpp
View File

@@ -1567,23 +1567,28 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic)
m_filename = name; m_filename = name;
asBinary = name + ".e3d"; asBinary = name + ".e3d";
if (FileExists(asBinary))
// Hirek: Jesli mamy ustawione priorityLoadText3D na yes to wpierw ladujemy t3d
if (Global.priorityLoadText3D && FileExists(name + ".t3d"))
{ {
LoadFromBinFile(asBinary, dynamic); WriteLog("Forced loading text model \"" + name + ".t3d\"");
asBinary = ""; // wyłączenie zapisu LoadFromTextFile(name + ".t3d", dynamic);
if (!dynamic)
Init(); Init();
} }
else else if (FileExists(asBinary))
{ {
if (FileExists(name + ".t3d")) LoadFromBinFile(asBinary, dynamic);
asBinary = "";
Init();
}
else if (FileExists(name + ".t3d"))
{ {
LoadFromTextFile(name + ".t3d", dynamic); // wczytanie tekstowego LoadFromTextFile(name + ".t3d", dynamic);
if( !dynamic ) { if (!dynamic)
// pojazdy dopiero po ustawieniu animacji Init();
Init(); // generowanie siatek i zapis E3D
}
}
} }
bool const result = bool const result =
Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem
if (false == result) if (false == result)

3
command.cpp
View File

@@ -380,7 +380,8 @@ commanddescription_sequence Commands_descriptions = {
}; };
// Maps of command and coresponding strings // Maps of command and coresponding strings
std::unordered_map<std::string, user_command> commandMap = {{"aidriverdisable", user_command::aidriverdisable}, std::unordered_map<std::string, user_command> commandMap = {
{"aidriverdisable", user_command::aidriverdisable},
{"jointcontrollerset", user_command::jointcontrollerset}, {"jointcontrollerset", user_command::jointcontrollerset},
{"mastercontrollerincrease", user_command::mastercontrollerincrease}, {"mastercontrollerincrease", user_command::mastercontrollerincrease},
{"mastercontrollerincreasefast", user_command::mastercontrollerincreasefast}, {"mastercontrollerincreasefast", user_command::mastercontrollerincreasefast},