mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-24 08:32:34 +02:00
73019c204d
grep -r --include \*.h --include \*.cpp "= std::" * | grep -v auto | grep -Po ".*[^ ]+ [^ ]+ [^ ]*[ ]*=.*;" | grep -v "auto\|int\|char\|bool\|float|\double\|for\|if\|googletest\|fuzzylite\|size_t\|using\|return" | grep -v double | grep -v si64 | grep -v si32 | grep -v ui32 | grep \< | grep -v float | tr -d '\t' | grep -v assert > redundant_types.txt
import re
with open("redundant_types.txt") as f:
for line in f:
line = line.strip()
path = line.split(":", 1)[0]
original_code = ":".join(line.split(":")[1:]).strip()
print()
print(path)
print(original_code)
prefix = "auto "
if original_code.startswith("static"):
static = True
else:
static = False
cpp_type = " ".join(original_code.split("=")[0].strip().split(" ")[0:-1])
print(cpp_type)
if static:
new_code = "static auto "+ " ".join(original_code.split(" ")[2:])
else:
new_code = "auto "+ " ".join(original_code.split(" ")[1:])
print(new_code)
if True:
with open(path, "r") as f:
filedata = f.read()
filedata = filedata.replace(original_code, new_code)
with open(path, "w") as f:
f.write(filedata)
93 lines
2.0 KiB
C++
93 lines
2.0 KiB
C++
/*
|
|
* BattleFieldHandler.cpp, part of VCMI engine
|
|
*
|
|
* Authors: listed in file AUTHORS in main folder
|
|
*
|
|
* License: GNU General Public License v2.0 or later
|
|
* Full text of license available in license.txt file, in main folder
|
|
*
|
|
*/
|
|
#include "StdInc.h"
|
|
|
|
#include <vcmi/Entity.h>
|
|
#include "BattleFieldHandler.h"
|
|
#include "JsonNode.h"
|
|
|
|
VCMI_LIB_NAMESPACE_BEGIN
|
|
|
|
BattleFieldInfo * BattleFieldHandler::loadFromJson(const std::string & scope, const JsonNode & json, const std::string & identifier, size_t index)
|
|
{
|
|
assert(identifier.find(':') == std::string::npos);
|
|
|
|
auto * info = new BattleFieldInfo(BattleField(index), identifier);
|
|
|
|
info->graphics = ImagePath::fromJson(json["graphics"]);
|
|
info->icon = json["icon"].String();
|
|
info->name = json["name"].String();
|
|
for(const auto & b : json["bonuses"].Vector())
|
|
{
|
|
auto bonus = JsonUtils::parseBonus(b);
|
|
|
|
bonus->source = BonusSource::TERRAIN_OVERLAY;
|
|
bonus->sid = BonusSourceID(info->getId());
|
|
bonus->duration = BonusDuration::ONE_BATTLE;
|
|
|
|
info->bonuses.push_back(bonus);
|
|
}
|
|
|
|
info->isSpecial = json["isSpecial"].Bool();
|
|
for(auto node : json["impassableHexes"].Vector())
|
|
info->impassableHexes.emplace_back(node.Integer());
|
|
|
|
return info;
|
|
}
|
|
|
|
std::vector<JsonNode> BattleFieldHandler::loadLegacyData()
|
|
{
|
|
return std::vector<JsonNode>();
|
|
}
|
|
|
|
const std::vector<std::string> & BattleFieldHandler::getTypeNames() const
|
|
{
|
|
static auto std::vector<std::string> types = std::vector<std::string> { "battlefield" };
|
|
|
|
return types;
|
|
}
|
|
|
|
int32_t BattleFieldInfo::getIndex() const
|
|
{
|
|
return battlefield.getNum();
|
|
}
|
|
|
|
int32_t BattleFieldInfo::getIconIndex() const
|
|
{
|
|
return iconIndex;
|
|
}
|
|
|
|
std::string BattleFieldInfo::getJsonKey() const
|
|
{
|
|
return identifier;
|
|
}
|
|
|
|
std::string BattleFieldInfo::getNameTextID() const
|
|
{
|
|
return name;
|
|
}
|
|
|
|
std::string BattleFieldInfo::getNameTranslated() const
|
|
{
|
|
return name; // TODO?
|
|
}
|
|
|
|
void BattleFieldInfo::registerIcons(const IconRegistar & cb) const
|
|
{
|
|
//cb(getIconIndex(), "BATTLEFIELD", icon);
|
|
}
|
|
|
|
BattleField BattleFieldInfo::getId() const
|
|
{
|
|
return battlefield;
|
|
}
|
|
|
|
VCMI_LIB_NAMESPACE_END
|