Merge branch 'temp' into develop

# Conflicts:
#	src/Components/Modules/ServerList.cpp
#	src/Components/Modules/ServerList.hpp

.gitattributes

@@ -0,0 +1,3 @@
+*.hpp eol=crlf
+*.cpp eol=crlf
+*.lua eol=crlf

CHANGELOG.md

@@ -31,6 +31,7 @@ This is the first public Beta version.
 - Improve node synchronization handling.
 - Improve security by modifying GUIDs to allow 64-bit certificate fingerprints.
 - Optimize fastfiles, they are now a lot smaller.
+- Replace intro.
 
 ### Fixed
 

src/Components/Modules/AssetInterfaces/IXModel.cpp

@@ -202,8 +202,16 @@ namespace Assets
 					asset->physPreset->sndAliasPrefix = reader.readCString();
 				}
 
+				// This is an experiment, ak74 fails though
+				if (asset->name == "weapon_ak74u"s)
+				{
+					asset->physPreset = nullptr;
+				}
+				else
+				{
 					Components::AssetHandler::StoreTemporaryAsset(Game::XAssetType::ASSET_TYPE_PHYSPRESET, { asset->physPreset });
 				}
+			}
 
 			if (asset->physCollmap)
 			{

src/Components/Modules/Maps.cpp

@@ -504,14 +504,14 @@ namespace Components
 		{
 			Dvar::Register<bool>("isDlcInstalled_All", false, Game::DVAR_FLAG_USERCREATED | Game::DVAR_FLAG_WRITEPROTECTED, "");
 
-			Maps::AddDlc({ 1, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.1.Stimulus.Package.zip"), { "mp_complex", "mp_compact", "mp_storm", "mp_overgrown", "mp_crash" } });
-			Maps::AddDlc({ 2, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.2.Resurgence.Pack.zip"), { "mp_abandon", "mp_vacant", "mp_trailerpark", "mp_strike", "mp_fuel2" } });
-			Maps::AddDlc({ 3, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.3.Nuketown.zip"), { "mp_nuked" } });
-			Maps::AddDlc({ 4, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.4.Classics.1.zip"), { "mp_cross_fire", "mp_cargoship", "mp_bloc" } });
-			Maps::AddDlc({ 5, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.5.Classics.2.zip"), { "mp_killhouse", "mp_bog_sh" } });
-			Maps::AddDlc({ 6, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.6.Cargoship.Winter.zip"), { "mp_cargoship_sh" } });
-			Maps::AddDlc({ 7, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.7.Resurrection.Pack.zip"), { "mp_shipment_long", "mp_rust_long", "mp_firingrange" } });
-			Maps::AddDlc({ 8, Utils::Cache::GetStaticUrl("/dlc/IW4.DLC.8.Recycled.Pack.zip"), { "mp_bloc_sh", "mp_crash_tropical", "mp_estate_tropical", "mp_fav_tropical", "mp_storm_spring" } });
+			Maps::AddDlc({ 1, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_complex", "mp_compact", "mp_storm", "mp_overgrown", "mp_crash" } });
+			Maps::AddDlc({ 2, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_abandon", "mp_vacant", "mp_trailerpark", "mp_strike", "mp_fuel2" } });
+			Maps::AddDlc({ 3, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_nuked" } });
+			Maps::AddDlc({ 4, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_cross_fire", "mp_cargoship", "mp_bloc" } });
+			Maps::AddDlc({ 5, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_killhouse", "mp_bog_sh" } });
+			Maps::AddDlc({ 6, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_cargoship_sh" } });
+			Maps::AddDlc({ 7, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_shipment_long", "mp_rust_long", "mp_firingrange" } });
+			Maps::AddDlc({ 8, Utils::Cache::GetStaticUrl("/dlc/"), { "mp_bloc_sh", "mp_crash_tropical", "mp_estate_tropical", "mp_fav_tropical", "mp_storm_spring" } });
 
 			Maps::UpdateDlcStatus();
 

src/Components/Modules/ModelSurfs.cpp

@@ -23,14 +23,14 @@ namespace Components
 			Game::XSurface* surface = &surfs->surfaces[i];
 			if (surface->zoneHandle == -1)
 			{
-				IDirect3DVertexBuffer9* vertexBuffer;
-				IDirect3DIndexBuffer9* indexBuffer;
+				IDirect3DVertexBuffer9* vertexBuffer = nullptr;
+				IDirect3DIndexBuffer9* indexBuffer = nullptr;
 
 				Game::Load_VertexBuffer(surface->verts0, &vertexBuffer, surface->vertCount * 32);
 				Game::Load_IndexBuffer(surface->triIndices, &indexBuffer, surface->triCount * 3);
 
-				ModelSurfs::BufferMap[surface->verts0] = vertexBuffer;
-				ModelSurfs::BufferMap[surface->triIndices] = indexBuffer;
+				if (vertexBuffer) ModelSurfs::BufferMap[surface->verts0] = vertexBuffer;
+				if (indexBuffer) ModelSurfs::BufferMap[surface->triIndices] = indexBuffer;
 			}
 		}
 	}
@@ -189,6 +189,8 @@ namespace Components
 			{
 				hasCustomSurface = true;
 
+				if (!ModelSurfs::BufferMap.empty())
+				{
 					auto buffer = ModelSurfs::BufferMap.find(surface->triIndices);
 					if (buffer != ModelSurfs::BufferMap.end())
 					{
@@ -204,8 +206,9 @@ namespace Components
 					}
 				}
 			}
+		}
 
-		if (hasCustomSurface)
+		if (hasCustomSurface && !ModelSurfs::AllocMap.empty())
 		{
 			auto allocData = ModelSurfs::AllocMap.find(header.surfaces->name);
 			if (allocData != ModelSurfs::AllocMap.end())

src/Components/Modules/QuickPatch.cpp

@@ -483,6 +483,9 @@ namespace Components
 				Game::Con_DrawMiniConsole(0, 2, 4, (Game::CL_IsCgameInitialized() ? 1.0f : 0.4f));
 			}
 		});
+#else
+		// Remove missing tag message
+		Utils::Hook::Nop(0x4EBF1A, 5);
 #endif
 	}
 

src/Components/Modules/UIFeeder.cpp

@@ -299,6 +299,11 @@ namespace Components
 
 		// correct feeder 4
 		Utils::Hook(0x4C260E, UIFeeder::ApplyMapFeeder, HOOK_CALL).install()->quick();
+
+		// Fix feeder focus
+		//Utils::Hook::Nop(0x63B1DD, 2); // Flag 4 check (WINDOW_VISIBLE)
+		Utils::Hook::Nop(0x63B1E6, 2); // Flag 2 check (WINDOW_HASFOCUS)
+		Utils::Hook::Nop(0x63B1F7, 2); // Flag 2000 check (WINDOW_LB_THUMB?)
 	}
 
 	UIFeeder::~UIFeeder()