Merge branch 'develop' of github.com:iw4x/iw4x-client into codo_461_dump

# Conflicts: # src/Components/Modules/AssetHandler.cpp # src/Components/Modules/ZoneBuilder.cpp
iw4x · Jun 16, 2024 · 824fb06 · 824fb06
2 parents 38b97c8 + 3a70a93
commit 824fb06
Show file tree

Hide file tree

Showing 56 changed files with 2,225 additions and 1,400 deletions.
diff --git a/deps/iw4-open-formats b/deps/iw4-open-formats
diff --git a/src/Components/Loader.cpp b/src/Components/Loader.cpp
@@ -15,6 +15,7 @@
 #include "Modules/ClientCommand.hpp"
 #include "Modules/ConnectProtocol.hpp"
 #include "Modules/Console.hpp"
+#include "Modules/ConfigStrings.hpp"
 #include "Modules/D3D9Ex.hpp"
 #include "Modules/Debug.hpp"
 #include "Modules/Discord.hpp"
@@ -32,6 +33,7 @@
 #include "Modules/MapRotation.hpp"
 #include "Modules/Materials.hpp"
 #include "Modules/ModList.hpp"
+#include "Modules/ModelCache.hpp"
 #include "Modules/ModelSurfs.hpp"
 #include "Modules/NetworkDebug.hpp"
 #include "Modules/News.hpp"
@@ -110,6 +112,8 @@ namespace Components
 		Register(new UIScript());
 		Register(new ZoneBuilder());
 
+		Register(new ConfigStrings()); // Needs to be there early !! Before modelcache & weapons
+
 		Register(new ArenaLength());
 		Register(new AssetHandler());
 		Register(new Bans());
@@ -144,6 +148,7 @@ namespace Components
 		Register(new Materials());
 		Register(new Menus());
 		Register(new ModList());
+		Register(new ModelCache());
 		Register(new ModelSurfs());
 		Register(new NetworkDebug());
 		Register(new News());
@@ -173,7 +178,7 @@ namespace Components
 		Register(new Threading());
 		Register(new Toast());
 		Register(new UIFeeder());
-		//Register(new Updater());
+		Register(new Updater());
 		Register(new VisionFile());
 		Register(new Voice());
 		Register(new Vote());

diff --git a/src/Components/Modules/AssetHandler.cpp b/src/Components/Modules/AssetHandler.cpp
@@ -226,10 +226,17 @@ namespace Components
 
 	void AssetHandler::ModifyAsset(Game::XAssetType type, Game::XAssetHeader asset, const std::string& name)
 	{
-		if (name == "zfeather_dfog_dtex.hlsl"s)
+#ifdef DEBUG
+		if (type == Game::XAssetType::ASSET_TYPE_IMAGE && name[0] != ',')
 		{
-			printf("");
+			const auto image = asset.image;
+			const auto cat = static_cast<Game::ImageCategory>(image->category);
+			if (cat == Game::ImageCategory::IMG_CATEGORY_UNKNOWN)
+			{
+				Logger::Warning(Game::CON_CHANNEL_GFX, "Image {} has wrong category IMG_CATEGORY_UNKNOWN, this is an IMPORTANT ISSUE that should be fixed!\n", name);
+			}
 		}
+#endif
 
 		if (type == Game::ASSET_TYPE_MATERIAL && (name == "gfx_distortion_knife_trail" || name == "gfx_distortion_heat_far" || name == "gfx_distortion_ring_light" || name == "gfx_distortion_heat") && asset.material->info.sortKey >= 43)
 		{
@@ -624,7 +631,7 @@ namespace Components
 		Game::ReallocateAssetPool(Game::ASSET_TYPE_VERTEXSHADER, ZoneBuilder::IsEnabled() ? 0x2000 : 3072);
 		Game::ReallocateAssetPool(Game::ASSET_TYPE_MATERIAL, 8192 * 2);
 		Game::ReallocateAssetPool(Game::ASSET_TYPE_VERTEXDECL, ZoneBuilder::IsEnabled() ? 0x400 : 196);
-		Game::ReallocateAssetPool(Game::ASSET_TYPE_WEAPON, WEAPON_LIMIT);
+		Game::ReallocateAssetPool(Game::ASSET_TYPE_WEAPON, Weapon::WEAPON_LIMIT);
 		Game::ReallocateAssetPool(Game::ASSET_TYPE_STRINGTABLE, 800);
 		Game::ReallocateAssetPool(Game::ASSET_TYPE_IMPACT_FX, 8);