summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-03 22:01:12 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-03 22:01:12 +0100
commitd9fb83300cf831ea31a74d509f9be9f2ed4f1189 (patch)
tree3168d88fa61eaf37d4511b1d45e8fcdc87f70784
parentRemoved unused lookups (diff)
downloadcuberite-d9fb83300cf831ea31a74d509f9be9f2ed4f1189.tar
cuberite-d9fb83300cf831ea31a74d509f9be9f2ed4f1189.tar.gz
cuberite-d9fb83300cf831ea31a74d509f9be9f2ed4f1189.tar.bz2
cuberite-d9fb83300cf831ea31a74d509f9be9f2ed4f1189.tar.lz
cuberite-d9fb83300cf831ea31a74d509f9be9f2ed4f1189.tar.xz
cuberite-d9fb83300cf831ea31a74d509f9be9f2ed4f1189.tar.zst
cuberite-d9fb83300cf831ea31a74d509f9be9f2ed4f1189.zip
-rw-r--r--Tools/BiomeVisualiser/BiomeRenderer.cpp2
-rw-r--r--src/BiomeDef.cpp4
-rw-r--r--src/BiomeDef.h6
-rw-r--r--src/Generating/BioGen.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/Tools/BiomeVisualiser/BiomeRenderer.cpp b/Tools/BiomeVisualiser/BiomeRenderer.cpp
index 5c572d33e..c0123c08a 100644
--- a/Tools/BiomeVisualiser/BiomeRenderer.cpp
+++ b/Tools/BiomeVisualiser/BiomeRenderer.cpp
@@ -78,7 +78,7 @@ bool cBiomeRenderer::Render(cPixmap & a_Pixmap)
{
for (int i = 0; i < ARRAYCOUNT(CurBiomes); i++)
{
- CurBiomes[i] = EMCSBiome::biInvalidBiome;
+ CurBiomes[i] = biInvalidBiome;
}
break;
}
diff --git a/src/BiomeDef.cpp b/src/BiomeDef.cpp
index 5c1156484..3fba93e8a 100644
--- a/src/BiomeDef.cpp
+++ b/src/BiomeDef.cpp
@@ -13,11 +13,11 @@ EMCSBiome StringToBiome(const AString & a_BiomeString)
int res = atoi(a_BiomeString.c_str());
if ((res != 0) || (a_BiomeString.compare("0") == 0))
{
- if(res >= biFirstBiome && res < biNumBiomes)
+ if ((res >= biFirstBiome) && (res < biNumBiomes))
{
return (EMCSBiome)res;
}
- else if(res >= biFirstVarientBiome && res < biNumVarientBiomes)
+ else if ((res >= biFirstVariantBiome) && (res < biNumVariantBiomes))
{
return (EMCSBiome)res;
}
diff --git a/src/BiomeDef.h b/src/BiomeDef.h
index f015dd836..474d4df76 100644
--- a/src/BiomeDef.h
+++ b/src/BiomeDef.h
@@ -77,7 +77,7 @@ enum EMCSBiome
biVariant = 128,
// Release 1.7 biome variants:
- biFirstVarientBiome = 129,
+ biFirstVariantBiome = 129,
biSunflowerPlains = 129,
biDesertM = 130,
biExtremeHillsM = 131,
@@ -100,8 +100,8 @@ enum EMCSBiome
biMesaPlateauFM = 166,
biMesaPlateauM = 167,
// Automatically capture the maximum consecutive biome value into biVarientMaxBiome:
- biNumVarientBiomes, // True number of biomes, since they are zero-based
- biMaxVarientBiome = biNumVarientBiomes - 1, // The maximum biome value
+ biNumVariantBiomes, // True number of biomes, since they are zero-based
+ biMaxVariantBiome = biNumVariantBiomes - 1, // The maximum biome value
} ;
/// Translates a biome string to biome enum. Takes either a number or a biome alias (built-in). Returns biInvalidBiome on failure.
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 1a18f53f1..20f269fc8 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -97,7 +97,7 @@ void cBioGenConstant::InitializeBiomeGen(cIniFile & a_IniFile)
{
AString Biome = a_IniFile.GetValueSet("Generator", "ConstantBiome", "Plains");
m_Biome = StringToBiome(Biome);
- if (m_Biome == EMCSBiome::biInvalidBiome)
+ if (m_Biome == biInvalidBiome)
{
LOGWARN("[Generator]::ConstantBiome value \"%s\" not recognized, using \"Plains\".", Biome.c_str());
m_Biome = biPlains;