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

Correct dependency loading.

Browse Source
This commit is contained in:
momo5502 2016-11-05 00:59:41 +01:00
parent 2d5094e7b4
commit d1c2a9d194
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,9 @@ namespace Components
Utils::Memory::Allocator allocator; Utils::Memory::Allocator allocator;
auto teams = Maps::GetTeamsForMap(Maps::CurrentMainZone); auto teams = Maps::GetTeamsForMap(Maps::CurrentMainZone);
auto dependencies = Maps::GetDependenciesForMap(Maps::CurrentMainZone); auto dependencies = Maps::GetDependenciesForMap(Maps::CurrentMainZone);
Utils::Merge(&Maps::CurrentDependencies, dependencies.data(), dependencies.size());
std::vector<Game::XZoneInfo> data; std::vector<Game::XZoneInfo> data;
Utils::Merge(&data, zoneInfo, zoneCount); Utils::Merge(&data, zoneInfo, zoneCount);
@ -46,17 +48,6 @@ namespace Components
team.name = allocator.DuplicateString(fmt::sprintf("iw4x_team_%s", teams.second.data())); team.name = allocator.DuplicateString(fmt::sprintf("iw4x_team_%s", teams.second.data()));
data.push_back(team); data.push_back(team);
for (auto& depdendency : dependencies)
{
Game::XZoneInfo info;
info.name = depdendency.data();
info.allocFlags = zoneInfo->allocFlags;
info.freeFlags = zoneInfo->freeFlags;
data.push_back(info);
}
for (unsigned int i = 0; i < Maps::CurrentDependencies.size(); ++i) for (unsigned int i = 0; i < Maps::CurrentDependencies.size(); ++i)
{ {
Game::XZoneInfo info; Game::XZoneInfo info;