flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Using C++11 loops

Browse Source
This commit is contained in:
STRWarrior 2014-10-15 18:11:28 +02:00
parent fa6f8fb38e
commit 4038e1cb42
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Enchantments.cpp
View File

@ -1024,20 +1024,20 @@ cEnchantments cEnchantments::GetRandomEnchantmentFromVector(cWeightedEnchantment
cEnchantments cEnchantments::GenerateEnchantmentFromVector(cWeightedEnchantments & a_Enchantments, int a_Seed)
{
int AllWeights = 0;
for (cWeightedEnchantments::iterator it = a_Enchantments.begin(); it != a_Enchantments.end(); ++it)
for (const auto Enchantment : a_Enchantments)
{
AllWeights += (*it).m_Weight;
AllWeights += Enchantment.m_Weight;
}
cNoise Noise(a_Seed);
int RandomNumber = Noise.IntNoise1DInt(AllWeights) / 7 % AllWeights;
for (cWeightedEnchantments::iterator it = a_Enchantments.begin(); it != a_Enchantments.end(); ++it)
for (const auto Enchantment : a_Enchantments)
{
RandomNumber -= (*it).m_Weight;
RandomNumber -= Enchantment.m_Weight;
if (RandomNumber < 0)
{
return (*it).m_Enchantments;
return Enchantment.m_Enchantments;
}
}