From 1f4e59949fd94b93d0a274167b6c7d55955f038b Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 1 Nov 2016 13:23:45 +0100 Subject: [PATCH] ZM map loading --- src/Components/Modules/AssetHandler.cpp | 2 +- src/Components/Modules/Maps.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Modules/AssetHandler.cpp b/src/Components/Modules/AssetHandler.cpp index 0be0660e..12e2bc02 100644 --- a/src/Components/Modules/AssetHandler.cpp +++ b/src/Components/Modules/AssetHandler.cpp @@ -117,7 +117,7 @@ namespace Components void AssetHandler::ModifyAsset(Game::XAssetType type, Game::XAssetHeader asset, std::string name) { - if (type == Game::XAssetType::ASSET_TYPE_MATERIAL && name == "wc/codo_ui_viewer_black_decal3") + if (type == Game::XAssetType::ASSET_TYPE_MATERIAL && (name == "wc/codo_ui_viewer_black_decal3" || name == "wc/codo_ui_viewer_black_decal2" || name == "wc/hint_arrows02")) { asset.material->sortKey = 0xE; } diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp index 838a8bc8..bf6b28cf 100644 --- a/src/Components/Modules/Maps.cpp +++ b/src/Components/Modules/Maps.cpp @@ -165,7 +165,7 @@ namespace Components void Maps::GetBSPName(char* buffer, size_t size, const char* format, const char* mapname) { - if (!Utils::String::StartsWith(mapname, "mp_") && mapname != "zm_asylum_sh"s && mapname != "zm_prototype_sh"s && mapname != "zm_zombie_training"s) + if (!Utils::String::StartsWith(mapname, "mp_") && !Utils::String::StartsWith(mapname, "zm_")) { format = "maps/%s.d3dbsp"; }