From ba052b201ea653a455b57347d71aea348d213244 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 1 Nov 2016 13:21:03 +0100 Subject: [PATCH] Shader stuff --- src/Components/Modules/Maps.cpp | 3 ++- src/Components/Modules/Maps.hpp | 3 ++- src/Components/Modules/Zones.cpp | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp index 45f17e66..838a8bc8 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) + if (!Utils::String::StartsWith(mapname, "mp_") && mapname != "zm_asylum_sh"s && mapname != "zm_prototype_sh"s && mapname != "zm_zombie_training"s) { format = "maps/%s.d3dbsp"; } @@ -517,6 +517,7 @@ namespace Components Game::ReallocateAssetPool(Game::XAssetType::ASSET_TYPE_VERTEXDECL, 196); Game::ReallocateAssetPool(Game::XAssetType::ASSET_TYPE_WEAPON, 2400); Game::ReallocateAssetPool(Game::XAssetType::ASSET_TYPE_STRINGTABLE, 800); + Game::ReallocateAssetPool(Game::XAssetType::ASSET_TYPE_IMPACTFX, 8); Maps::ReallocateEntryPool(); diff --git a/src/Components/Modules/Maps.hpp b/src/Components/Modules/Maps.hpp index 4c536dd5..fa52e1dd 100644 --- a/src/Components/Modules/Maps.hpp +++ b/src/Components/Modules/Maps.hpp @@ -15,6 +15,8 @@ namespace Components static std::pair GetTeamsForMap(std::string map); + static std::string CurrentMainZone; + private: class DLC { @@ -28,7 +30,6 @@ namespace Components static std::vector DlcPacks; static std::vector EntryPool; - static std::string CurrentMainZone; static std::vector> DependencyList; static std::vector CurrentDependencies; diff --git a/src/Components/Modules/Zones.cpp b/src/Components/Modules/Zones.cpp index 61303522..cd21500b 100644 --- a/src/Components/Modules/Zones.cpp +++ b/src/Components/Modules/Zones.cpp @@ -1045,17 +1045,18 @@ namespace Components if (arg->paramID > 15 && arg->paramID < 30) { arg->paramID -= 1; + + if (arg->paramID == 19) + { + arg->paramID = 21; + } } else if (arg->paramID >= 50) { arg->paramID += 6; } } - } -// else if (Zones::Version() >= 359 && arg->paramID == 20592) -// { -// arg->paramID == 25180; -// } + } } return result;