games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +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

7
lib/RiverHandler.cpp
View File

@ -13,17 +13,18 @@
#include "CGeneralTextHandler.h"
#include "GameSettings.h"
#include "json/JsonNode.h"
#include "VCMI_Lib.h"
VCMI_LIB_NAMESPACE_BEGIN
RiverTypeHandler::RiverTypeHandler()
{
objects.push_back(new RiverType());
objects.emplace_back(new RiverType());
VLC->generaltexth->registerString("core", objects[0]->getNameTextID(), "");
}
RiverType * RiverTypeHandler::loadFromJson(
std::shared_ptr<RiverType> RiverTypeHandler::loadFromJson(
const std::string & scope,
const JsonNode & json,
const std::string & identifier,
@ -31,7 +32,7 @@ RiverType * RiverTypeHandler::loadFromJson(
{
assert(identifier.find(':') == std::string::npos);
auto * info = new RiverType;
auto info = std::make_shared<RiverType>();
info->id = RiverId(index);
info->identifier = identifier;