Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Require teamzones when there's no arena entry (fixes sp maps missing … (#391)

Browse Source 
* Require teamzones when there's no arena entry (fixes sp maps missing teams)

* Move requireteamzones=true to method

Co-authored-by: rackover <roxanne@thegamebakers.com>
This commit is contained in:
Louve 2022-07-27 10:54:36 +02:00 committed by GitHub
parent ae255777d0
commit 14181d04d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Components/Modules/Maps.cpp
View File

@ -340,11 +340,17 @@ namespace Components
Maps::MapDependencies dependencies{};
// True by default - cause some maps won't have an arenafile entry
dependencies.requiresTeamZones = true;
for (int i = 0; i < *Game::arenaCount; ++i)
{
Game::newMapArena_t* arena = &ArenaLength::NewArenas[i];
if (arena->mapName == map)
{
// If it's in the arena file, surely it's a vanilla map that doesn't need teams...
dependencies.requiresTeamZones = false;
for (std::size_t j = 0; j < std::extent_v<decltype(Game::newMapArena_t::keys)>; ++j)
{
const auto* key = arena->keys[j];
@ -363,6 +369,7 @@ namespace Components
}
else if (key == "useteamzones"s)
{
// ... unless it specifies so! This allows loading of CODO/COD4 zones that might not have the correct teams
dependencies.requiresTeamZones = Utils::String::ToLower(value) == "true"s;
}
}