games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

lib now uses shared_ptr for entities. Removed manual memory management.

Browse Source
This commit is contained in:
Ivan Savenko
2024-05-16 22:05:51 +00:00
parent 0d427980bc
commit 7461df161c
68 changed files with 173 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CCreatureHandler.cpp
View File

@@ -587,12 +587,12 @@ std::vector<JsonNode> CCreatureHandler::loadLegacyData()
return h3Data;
}
CCreature * CCreatureHandler::loadFromJson(const std::string & scope, const JsonNode & node, const std::string & identifier, size_t index)
std::shared_ptr<CCreature> CCreatureHandler::loadFromJson(const std::string & scope, const JsonNode & node, const std::string & identifier, size_t index)
{
assert(identifier.find(':') == std::string::npos);
assert(!scope.empty());
auto * cre = new CCreature();
auto cre = std::make_shared<CCreature>();
if(node["hasDoubleWeek"].Bool())
{
@@ -635,9 +635,9 @@ CCreature * CCreatureHandler::loadFromJson(const std::string & scope, const Json
if(!node["shots"].isNull())
cre->addBonus(node["shots"].Integer(), BonusType::SHOTS);
loadStackExperience(cre, node["stackExperience"]);
loadJsonAnimation(cre, node["graphics"]);
loadCreatureJson(cre, node);
loadStackExperience(cre.get(), node["stackExperience"]);
loadJsonAnimation(cre.get(), node["graphics"]);
loadCreatureJson(cre.get(), node);
for(const auto & extraName : node["extraNames"].Vector())
{