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

Throw some more ZB errors

Browse Source
This commit is contained in:
momo5502 2016-10-26 21:50:57 +02:00
parent b409def26e
commit 49016ccad2
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Components/Modules/ZoneBuilder.cpp
View File

@ -103,7 +103,19 @@ namespace Components
} }
else else
{ {
ZoneBuilder::Zone::RenameAsset(Game::DB_GetXAssetNameType(DataMap.GetElementAt(i, 0).data()), DataMap.GetElementAt(i, 1), DataMap.GetElementAt(i, 2)); std::string oldName = DataMap.GetElementAt(i, 1);
std::string newName = DataMap.GetElementAt(i, 2);
std::string typeName = DataMap.GetElementAt(i, 0).data();
Game::XAssetType type = Game::DB_GetXAssetNameType(typeName.data());
if (type < Game::XAssetType::ASSET_TYPE_COUNT && type >= 0)
{
ZoneBuilder::Zone::RenameAsset(type, oldName, newName);
}
else
{
Logger::Error("Unable to rename '%s' to '%s' as the asset type '%s' is invalid!", oldName.data(), newName.data(), typeName.data());
}
} }
} }
@ -411,22 +423,30 @@ namespace Components
// Store a new name for a given asset // Store a new name for a given asset
void ZoneBuilder::Zone::RenameAsset(Game::XAssetType type, std::string asset, std::string newName) void ZoneBuilder::Zone::RenameAsset(Game::XAssetType type, std::string asset, std::string newName)
{ {
if (type < Game::XAssetType::ASSET_TYPE_COUNT) if (type < Game::XAssetType::ASSET_TYPE_COUNT && type >= 0)
{ {
ZoneBuilder::Zone::RenameMap[type][asset] = newName; ZoneBuilder::Zone::RenameMap[type][asset] = newName;
} }
else
{
Logger::Error("Unable to rename '%s' to '%s' as the asset type is invalid!", asset.data(), newName.data());
}
} }
// Return the new name for a given asset // Return the new name for a given asset
std::string ZoneBuilder::Zone::GetAssetName(Game::XAssetType type, std::string asset) std::string ZoneBuilder::Zone::GetAssetName(Game::XAssetType type, std::string asset)
{ {
if (type < Game::XAssetType::ASSET_TYPE_COUNT) if (type < Game::XAssetType::ASSET_TYPE_COUNT && type >= 0)
{ {
if (ZoneBuilder::Zone::RenameMap[type].find(asset) != ZoneBuilder::Zone::RenameMap[type].end()) if (ZoneBuilder::Zone::RenameMap[type].find(asset) != ZoneBuilder::Zone::RenameMap[type].end())
{ {
return ZoneBuilder::Zone::RenameMap[type][asset]; return ZoneBuilder::Zone::RenameMap[type][asset];
} }
} }
else
{
Logger::Error("Unable to get name for '%s' as the asset type is invalid!", asset.data());
}
return asset; return asset;
} }