diff options
Diffstat (limited to 'src/BiomeDef.h')
| -rw-r--r-- | src/BiomeDef.h | 140 |
1 files changed, 69 insertions, 71 deletions
diff --git a/src/BiomeDef.h b/src/BiomeDef.h index a7b2b7e8a..6fe68972b 100644 --- a/src/BiomeDef.h +++ b/src/BiomeDef.h @@ -16,54 +16,54 @@ BiomeIDs over 255 are used by Cuberite internally and are translated to MC biome */ enum EMCSBiome { - biInvalidBiome = -1, - - biFirstBiome = 0, - biOcean = 0, - biPlains = 1, - biDesert = 2, - biExtremeHills = 3, - biForest = 4, - biTaiga = 5, - biSwampland = 6, - biRiver = 7, - biHell = 8, // same as Nether - biNether = 8, - biSky = 9, // same as biEnd - biEnd = 9, - biFrozenOcean = 10, - biFrozenRiver = 11, - biIcePlains = 12, - biTundra = 12, // same as Ice Plains - biIceMountains = 13, - biMushroomIsland = 14, - biMushroomShore = 15, - biBeach = 16, - biDesertHills = 17, - biForestHills = 18, - biTaigaHills = 19, + biInvalidBiome = -1, + + biFirstBiome = 0, + biOcean = 0, + biPlains = 1, + biDesert = 2, + biExtremeHills = 3, + biForest = 4, + biTaiga = 5, + biSwampland = 6, + biRiver = 7, + biHell = 8, // same as Nether + biNether = 8, + biSky = 9, // same as biEnd + biEnd = 9, + biFrozenOcean = 10, + biFrozenRiver = 11, + biIcePlains = 12, + biTundra = 12, // same as Ice Plains + biIceMountains = 13, + biMushroomIsland = 14, + biMushroomShore = 15, + biBeach = 16, + biDesertHills = 17, + biForestHills = 18, + biTaigaHills = 19, biExtremeHillsEdge = 20, - biJungle = 21, - biJungleHills = 22, + biJungle = 21, + biJungleHills = 22, // Release 1.7 biomes: - biJungleEdge = 23, - biDeepOcean = 24, - biStoneBeach = 25, - biColdBeach = 26, - biBirchForest = 27, + biJungleEdge = 23, + biDeepOcean = 24, + biStoneBeach = 25, + biColdBeach = 26, + biBirchForest = 27, biBirchForestHills = 28, - biRoofedForest = 29, - biColdTaiga = 30, - biColdTaigaHills = 31, - biMegaTaiga = 32, - biMegaTaigaHills = 33, + biRoofedForest = 29, + biColdTaiga = 30, + biColdTaigaHills = 31, + biMegaTaiga = 32, + biMegaTaigaHills = 33, biExtremeHillsPlus = 34, - biSavanna = 35, - biSavannaPlateau = 36, - biMesa = 37, - biMesaPlateauF = 38, - biMesaPlateau = 39, + biSavanna = 35, + biSavannaPlateau = 36, + biMesa = 37, + biMesaPlateauF = 38, + biMesaPlateau = 39, // Automatically capture the maximum consecutive biome value into biMaxBiome: biNumBiomes, // True number of biomes, since they are zero-based @@ -73,32 +73,32 @@ enum EMCSBiome biVariant = 128, // Release 1.7 biome variants: - biFirstVariantBiome = 129, - biSunflowerPlains = 129, - biDesertM = 130, - biExtremeHillsM = 131, - biFlowerForest = 132, - biTaigaM = 133, - biSwamplandM = 134, - biIcePlainsSpikes = 140, - biJungleM = 149, - biJungleEdgeM = 151, - biBirchForestM = 155, - biBirchForestHillsM = 156, - biRoofedForestM = 157, - biColdTaigaM = 158, - biMegaSpruceTaiga = 160, + biFirstVariantBiome = 129, + biSunflowerPlains = 129, + biDesertM = 130, + biExtremeHillsM = 131, + biFlowerForest = 132, + biTaigaM = 133, + biSwamplandM = 134, + biIcePlainsSpikes = 140, + biJungleM = 149, + biJungleEdgeM = 151, + biBirchForestM = 155, + biBirchForestHillsM = 156, + biRoofedForestM = 157, + biColdTaigaM = 158, + biMegaSpruceTaiga = 160, biMegaSpruceTaigaHills = 161, - biExtremeHillsPlusM = 162, - biSavannaM = 163, - biSavannaPlateauM = 164, - biMesaBryce = 165, - biMesaPlateauFM = 166, - biMesaPlateauM = 167, + biExtremeHillsPlusM = 162, + biSavannaM = 163, + biSavannaPlateauM = 164, + biMesaBryce = 165, + biMesaPlateauFM = 166, + biMesaPlateauM = 167, // Automatically capture the maximum consecutive biome value into biVarientMaxBiome: biNumVariantBiomes, // True number of biomes, since they are zero-based biMaxVariantBiome = biNumVariantBiomes - 1, // The maximum biome value -} ; +}; // tolua_end @@ -109,11 +109,8 @@ enum EMCSBiome /** Hash for EMCSBiome, so that it can be used in std::unordered_map etc. */ struct BiomeHasher { -public: - std::size_t operator() (const EMCSBiome a_Biome) const - { - return static_cast<std::size_t>(a_Biome); - } + public: + std::size_t operator()(const EMCSBiome a_Biome) const { return static_cast<std::size_t>(a_Biome); } }; @@ -122,7 +119,8 @@ public: // tolua_begin -/** Translates a biome string to biome enum. Takes either a number or a biome alias (built-in). Returns biInvalidBiome on failure. */ +/** Translates a biome string to biome enum. Takes either a number or a biome alias (built-in). Returns biInvalidBiome + * on failure. */ extern EMCSBiome StringToBiome(const AString & a_BiomeString); /** Translates biome enum into biome string. Returns empty string on failure (unknown biome). */ |