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

Merged branch 'origin/master' into c++11.

Browse Source
This commit is contained in:
Mattes D
2014-12-04 22:04:16 +01:00
parent 0ecc16c618 c8e75994cc
commit c014f5624c
75 changed files with 1071 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Generating/ChunkGenerator.cpp
View File

@@ -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);
}