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

Increased Type safety of Biomes

Browse Source 
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
This commit is contained in:
Tycho
2014-02-03 12:26:17 -08:00
parent 2450d0467f
commit 80807eec2c
9 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/BiomeDef.cpp
View File

@@ -13,8 +13,16 @@ EMCSBiome StringToBiome(const AString & a_BiomeString)
int res = atoi(a_BiomeString.c_str());
if ((res != 0) || (a_BiomeString.compare("0") == 0))
{
// It was a valid number
return (EMCSBiome)res;
if(res >= biFirstBiome && res < biNumBiomes)
{
return (EMCSBiome)res;
}
else if(res >= biFirstVarientBiome && res < biNumVarientBiomes)
{
return (EMCSBiome)res;
}
// It was an invalid number
return biInvalidBiome;
}
// Convert using the built-in map:
@@ -100,7 +108,7 @@ EMCSBiome StringToBiome(const AString & a_BiomeString)
return BiomeMap[i].m_Biome;
}
} // for i - BiomeMap[]
return (EMCSBiome)-1;
return biInvalidBiome;
}