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

FastRandom: Remove discrepancy between arg and return value type. (#3846)

Browse Source
This commit is contained in:
Mattes D
2017-07-21 12:06:21 +02:00
committed by GitHub
parent f9b56dd859
commit 895987a111
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MobSpawner.cpp
View File

@@ -45,12 +45,12 @@ bool cMobSpawner::CheckPackCenter(BLOCKTYPE a_BlockType)
void cMobSpawner::addIfAllowed(eMonsterType toAdd, std::set<eMonsterType>& toAddIn)
void cMobSpawner::addIfAllowed(eMonsterType toAdd, std::vector<eMonsterType> & toAddIn)
{
std::set<eMonsterType>::iterator itr = m_AllowedTypes.find(toAdd);
if (itr != m_AllowedTypes.end())
{
toAddIn.insert(toAdd);
toAddIn.push_back(toAdd);
}
}
@@ -60,7 +60,7 @@ void cMobSpawner::addIfAllowed(eMonsterType toAdd, std::set<eMonsterType>& toAdd
eMonsterType cMobSpawner::ChooseMobType(EMCSBiome a_Biome)
{
std::set<eMonsterType> allowedMobs;
std::vector<eMonsterType> allowedMobs;
if ((a_Biome == biMushroomIsland) || (a_Biome == biMushroomShore))
{
@@ -107,15 +107,11 @@ eMonsterType cMobSpawner::ChooseMobType(EMCSBiome a_Biome)
}
}
// Pick a random mob from the options:
size_t allowedMobsSize = allowedMobs.size();
if (allowedMobsSize > 0)
{
std::set<eMonsterType>::iterator itr = allowedMobs.begin();
using DiffType = decltype(itr)::difference_type;
std::advance(itr, GetRandomProvider().RandInt<DiffType>(allowedMobsSize - 1));
return *itr;
return allowedMobs[GetRandomProvider().RandInt(allowedMobsSize - 1)];
}
return mtInvalidType;
}