summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-28 22:46:58 +0100
committerMattes D <github@xoft.cz>2014-11-28 22:46:58 +0100
commit883230abbcc20a4a27e1d8909894be63dee75d43 (patch)
treeecbdc082281e820fc98a302add93400ba467dbd7 /src/Generating
parentCMake: Fixed linux builds. (diff)
parentChunk: Fixed same-name iterators. (diff)
downloadcuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.gz
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.bz2
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.lz
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.xz
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.tar.zst
cuberite-883230abbcc20a4a27e1d8909894be63dee75d43.zip
Diffstat (limited to 'src/Generating')
-rw-r--r--src/Generating/ChunkGenerator.cpp6
-rw-r--r--src/Generating/CompoGenBiomal.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 92e1bb31d..3ee02c767 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -191,13 +191,13 @@ EMCSBiome cChunkGenerator::GetBiomeAt(int a_BlockX, int a_BlockZ)
BLOCKTYPE cChunkGenerator::GetIniBlock(cIniFile & a_IniFile, const AString & a_SectionName, const AString & a_ValueName, const AString & a_Default)
{
AString BlockType = a_IniFile.GetValueSet(a_SectionName, a_ValueName, a_Default);
- BLOCKTYPE Block = BlockStringToType(BlockType);
+ int Block = BlockStringToType(BlockType);
if (Block < 0)
{
LOGWARN("[%s].%s Could not parse block value \"%s\". Using default: \"%s\".", a_SectionName.c_str(), a_ValueName.c_str(), BlockType.c_str(), a_Default.c_str());
- return BlockStringToType(a_Default);
+ return static_cast<BLOCKTYPE>(BlockStringToType(a_Default));
}
- return Block;
+ return static_cast<BLOCKTYPE>(Block);
}
diff --git a/src/Generating/CompoGenBiomal.cpp b/src/Generating/CompoGenBiomal.cpp
index 995851c95..030c2baa5 100644
--- a/src/Generating/CompoGenBiomal.cpp
+++ b/src/Generating/CompoGenBiomal.cpp
@@ -39,7 +39,7 @@ public:
// Fill the rest with stone:
static BlockInfo Stone = {E_BLOCK_STONE, 0};
- for (size_t i = a_Count; i < cChunkDef::Height; i++)
+ for (int i = static_cast<int>(a_Count); i < cChunkDef::Height; i++)
{
m_Pattern[i] = Stone;
}