games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merge branch 'develop' into interface-builder

Browse Source
This commit is contained in:
Nordsoft91
2022-12-24 21:56:29 +04:00
committed by GitHub
parent ad5bf2ac4f 5b57b69699
commit 785787e454
93 changed files with 888 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/rmg/CRmgTemplateStorage.cpp
View File

@@ -14,6 +14,7 @@
#include "CRmgTemplate.h"
#include "../serializer/JsonDeserializer.h"
#include "../CModHandler.h"
VCMI_LIB_NAMESPACE_BEGIN
@@ -30,7 +31,7 @@ void CRmgTemplateStorage::loadObject(std::string scope, std::string name, const
try
{
JsonDeserializer handler(nullptr, data);
auto fullKey = normalizeIdentifier(scope, "core", name); //actually it's not used
auto fullKey = normalizeIdentifier(scope, CModHandler::scopeBuiltin(), name); //actually it's not used
templates[fullKey].setId(fullKey);
templates[fullKey].serializeJson(handler);
templates[fullKey].setName(name);