Skip to content
Snippets Groups Projects
Commit 06155d8e authored by David Bergström's avatar David Bergström
Browse files

resulting_type -> result_type

parent e154da63
No related branches found
No related tags found
No related merge requests found
......@@ -52,7 +52,7 @@ void add_requirement(BuildDescription & description, json & requirement)
void parse_build_description(BuildDescription & description, json & build_item)
{
description.resulting_type = build_item["unit"];
description.result_type = build_item["unit"];
if (build_item.find("requires") != build_item.end())
{
......@@ -78,14 +78,14 @@ void TechTreeImproved::parse_unit(json::iterator it)
description.producer_type = producer_id;
parse_build_description(description, build_item);
if (result_to_data.count(description.resulting_type) > 0)
if (result_to_data.count(description.result_type) > 0)
{
std::cout << "Found more than one way to build " << sc2::UnitTypeToName(description.resulting_type) << " (" << (unsigned int) description.resulting_type << ")" << std::endl;
result_to_data[description.resulting_type].push_back(description);
//std::cout << "Found more than one way to build " << sc2::UnitTypeToName(description.result_type) << " (" << (unsigned int) description.result_type << ")" << std::endl;
result_to_data[description.result_type].push_back(description);
}
else
{
result_to_data[description.resulting_type] = { description };
result_to_data[description.result_type] = { description };
}
}
}
......
......@@ -11,7 +11,7 @@
struct BuildDescription
{
sc2::UNIT_TYPEID producer_type;
sc2::UNIT_TYPEID resulting_type;
sc2::UNIT_TYPEID result_type;
sc2::AbilityID ability_used;
float time;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment