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

Converted remaining identifier to new system

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-20 00:22:31 +03:00
parent 0240ee886d
commit e54287ea5d
91 changed files with 1590 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/JsonRandom.cpp
View File

@@ -15,7 +15,7 @@
#include "JsonNode.h"
#include "CRandomGenerator.h"
#include "StringConstants.h"
#include "constants/StringConstants.h"
#include "VCMI_Lib.h"
#include "CArtHandler.h"
#include "CCreatureHandler.h"
@@ -195,10 +195,10 @@ namespace JsonRandom
allowedClasses.insert(CArtHandler::stringToClass(entry.String()));
if (value["slot"].getType() == JsonNode::JsonType::DATA_STRING)
allowedPositions.insert(ArtifactPosition(value["class"].String()));
allowedPositions.insert(ArtifactPosition::decode(value["class"].String()));
else
for(const auto & entry : value["slot"].Vector())
allowedPositions.insert(ArtifactPosition(entry.String()));
allowedPositions.insert(ArtifactPosition::decode(entry.String()));
if (!value["minValue"].isNull()) minValue = static_cast<ui32>(value["minValue"].Float());
if (!value["maxValue"].isNull()) maxValue = static_cast<ui32>(value["maxValue"].Float());