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

4
lib/spells/CSpellHandler.cpp
View File

@@ -676,7 +676,7 @@ const std::vector<std::string> & CSpellHandler::getTypeNames() const
return typeNames;
}
CSpell * CSpellHandler::loadFromJson(const std::string & scope, const JsonNode & json, const std::string & identifier, size_t index)
std::shared_ptr<CSpell> CSpellHandler::loadFromJson(const std::string & scope, const JsonNode & json, const std::string & identifier, size_t index)
{
assert(identifier.find(':') == std::string::npos);
assert(!scope.empty());
@@ -685,7 +685,7 @@ CSpell * CSpellHandler::loadFromJson(const std::string & scope, const JsonNode &
SpellID id(static_cast<si32>(index));
auto * spell = new CSpell();
auto spell = std::make_shared<CSpell>();
spell->id = id;
spell->identifier = identifier;
spell->modScope = scope;