Resolve conflicts for merge

DynObj.cpp

@@ -770,7 +770,7 @@ void TDynamicObject::UpdateWiper(TAnim* pAnim)
 	if (!pAnim || !pAnim->smElement)
 		return;
 
-	int i = pAnim->iNumber;
+	int i = pAnim->iNumber; 
     // odwaramy animacje dla parzystych indexow
 	const double rotateAngle = (i + 1) % 2 == 0 ? -MoverParameters->WiperAngle : MoverParameters->WiperAngle;
 
@@ -6726,12 +6726,12 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co
                 else if (token == "wiperFromPark:")
                 {
 					sWiperFromPark.deserialize(parser, sound_type::single);
-					sWiperFromPark.owner(this);
+					sWiperFromPark.owner(this);  
                 }
 				else if (token == "wiperToPark:")
 				{
 					sWiperToPark.deserialize(parser, sound_type::single);
-					sWiperToPark.owner(this);
+					sWiperToPark.owner(this);  
 				}
 
 				else if (token == "retarder:") {

Globals.cpp

@@ -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

Globals.h

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

McZapkie/Mover.cpp

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

Model3d.cpp

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

command.h

@@ -344,34 +344,34 @@ enum class user_command
 	invertertoggle10,
 	invertertoggle11,
 	invertertoggle12,
-	globalradiostop,
+    globalradiostop,
-	timejump,
+    timejump,
-	timejumplarge,
+    timejumplarge,
-	timejumpsmall,
+    timejumpsmall,
-	setdatetime,
+    setdatetime,
-	setweather,
+    setweather,
-	settemperature,
+    settemperature,
-	vehiclemoveforwards,
+    vehiclemoveforwards,
-	vehiclemovebackwards,
+    vehiclemovebackwards,
-	vehicleboost,
+    vehicleboost,
-	debugtoggle,
+    debugtoggle,
-	focuspauseset,
+    focuspauseset,
-	pausetoggle,
+    pausetoggle,
-	entervehicle,
+    entervehicle,
-	resetconsist,
+    resetconsist,
-	fillcompressor,
+    fillcompressor,
-	consistreleaser,
+    consistreleaser,
-	queueevent,
+    queueevent,
-	setlight,
+    setlight,
-	insertmodel,
+    insertmodel,
-	deletemodel,
+    deletemodel,
-	dynamicmove,
+    dynamicmove,
-	consistteleport,
+    consistteleport,
-	pullalarmchain,
+    pullalarmchain,
-	sendaicommand,
+    sendaicommand,
-	spawntrainset,
+    spawntrainset,
-	destroytrainset,
+    destroytrainset,
-	quitsimulation,
+    quitsimulation,
 	wiperswitchincrease,
 	wiperswitchdecrease,