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

Remove usage of std::function from CRandomGenerator

Browse Source
This commit is contained in:
Ivan Savenko
2024-06-01 13:36:38 +00:00
parent ad9750ed3e
commit 60a51e98de
16 changed files with 61 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/json/JsonRandom.cpp
View File

@@ -63,7 +63,7 @@ VCMI_LIB_NAMESPACE_BEGIN
{
const auto & vector = value.Vector();
size_t index= rng.getIntRange(0, vector.size()-1)();
size_t index= rng.nextInt64(0, vector.size()-1);
return loadValue(vector[index], rng, variables, 0);
}
if(value.isStruct())
@@ -72,7 +72,7 @@ VCMI_LIB_NAMESPACE_BEGIN
return loadValue(value["amount"], rng, variables, defaultValue);
si32 min = loadValue(value["min"], rng, variables, 0);
si32 max = loadValue(value["max"], rng, variables, 0);
return rng.getIntRange(min, max)();
return rng.nextInt64(min, max);
}
return defaultValue;
}