From 06155d8e7fb249c8305c01c1d8e75fe6d54b4a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Bergstr=C3=B6m?= <davbe125@student.liu.se>
Date: Thu, 19 Jul 2018 10:55:05 +0200
Subject: [PATCH] resulting_type -> result_type
---
src/TechTreeImproved.cpp | 10 +++++-----
src/TechTreeImproved.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/TechTreeImproved.cpp b/src/TechTreeImproved.cpp
index 4798b9ed8..74f853766 100644
--- a/src/TechTreeImproved.cpp
+++ b/src/TechTreeImproved.cpp
@@ -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 };
}
}
}
diff --git a/src/TechTreeImproved.h b/src/TechTreeImproved.h
index 234a1e5cf..1c01572f8 100644
--- a/src/TechTreeImproved.h
+++ b/src/TechTreeImproved.h
@@ -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;
--
GitLab