Fix MgStoneType and BiomeType enum names

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index f491ed9ebe9cd3f40f7790d5ee87dc12f45c981f..01593718b773579c6ad0fa43c703c8f03cf3dcf4 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -384,7 +384,7 @@ MgStoneType MapgenBasic::generateBiomes()
 {
        v3s16 em = vm->m_area.getExtent();
        u32 index = 0;
-       MgStoneType stone_type = STONE;
+       MgStoneType stone_type = MGSTONE_STONE;
 
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
        for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
@@ -429,9 +429,9 @@ MgStoneType MapgenBasic::generateBiomes()
                                // This is more efficient than detecting per-node and will not
                                // miss any desert stone or sandstone biomes.
                                if (biome->c_stone == c_desert_stone)
-                                       stone_type = DESERT_STONE;
+                                       stone_type = MGSTONE_DESERT_STONE;
                                else if (biome->c_stone == c_sandstone)
-                                       stone_type = SANDSTONE;
+                                       stone_type = MGSTONE_SANDSTONE;
                        }
 
                        if (c == c_stone) {

diff --git a/src/mapgen.h b/src/mapgen.h
index bee8e786a702d306ddaddfc0bd2fbe2f00a840a4..3ec14829626aed22809ef037f8a66e521f2a4181 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -76,9 +76,9 @@ enum GenNotifyType {
 
 // TODO(hmmmm/paramat): make stone type selection dynamic
 enum MgStoneType {
-       STONE,
-       DESERT_STONE,
-       SANDSTONE,
+       MGSTONE_STONE,
+       MGSTONE_DESERT_STONE,
+       MGSTONE_SANDSTONE,
 };
 
 struct GenNotifyEvent {

diff --git a/src/mapgen_flat.cpp b/src/mapgen_flat.cpp
index 97f1c4b2a3fe53a8e5e4668859a88178de1e2501..2cbf9ace0ac0339393d84b3eba76f9ef5e2861dd 100644 (file)
--- a/src/mapgen_flat.cpp
+++ b/src/mapgen_flat.cpp
@@ -257,7 +257,7 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
                dp.np_density = nparams_dungeon_density;
                dp.np_wetness = nparams_dungeon_wetness;
                dp.c_water    = c_water_source;
-               if (stone_type == STONE) {
+               if (stone_type == MGSTONE_STONE) {
                        dp.c_cobble = c_cobble;
                        dp.c_moss   = c_mossycobble;
                        dp.c_stair  = c_stair_cobble;
@@ -267,7 +267,7 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(1, 2, 1);
                        dp.roomsize      = v3s16(0, 0, 0);
                        dp.notifytype    = GENNOTIFY_DUNGEON;
-               } else if (stone_type == DESERT_STONE) {
+               } else if (stone_type == MGSTONE_DESERT_STONE) {
                        dp.c_cobble = c_desert_stone;
                        dp.c_moss   = c_desert_stone;
                        dp.c_stair  = c_desert_stone;
@@ -277,7 +277,7 @@ void MapgenFlat::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(2, 3, 2);
                        dp.roomsize      = v3s16(2, 5, 2);
                        dp.notifytype    = GENNOTIFY_TEMPLE;
-               } else if (stone_type == SANDSTONE) {
+               } else if (stone_type == MGSTONE_SANDSTONE) {
                        dp.c_cobble = c_sandstonebrick;
                        dp.c_moss   = c_sandstonebrick;
                        dp.c_stair  = c_sandstonebrick;

diff --git a/src/mapgen_fractal.cpp b/src/mapgen_fractal.cpp
index 81e1620722e79fcbfe3099e37386c2f48eceb678..3217d52e2f0812f5613ff84db70de98955ebe1fa 100644 (file)
--- a/src/mapgen_fractal.cpp
+++ b/src/mapgen_fractal.cpp
@@ -273,7 +273,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
                dp.np_density = nparams_dungeon_density;
                dp.np_wetness = nparams_dungeon_wetness;
                dp.c_water    = c_water_source;
-               if (stone_type == STONE) {
+               if (stone_type == MGSTONE_STONE) {
                        dp.c_cobble = c_cobble;
                        dp.c_moss   = c_mossycobble;
                        dp.c_stair  = c_stair_cobble;
@@ -283,7 +283,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(1, 2, 1);
                        dp.roomsize      = v3s16(0, 0, 0);
                        dp.notifytype    = GENNOTIFY_DUNGEON;
-               } else if (stone_type == DESERT_STONE) {
+               } else if (stone_type == MGSTONE_DESERT_STONE) {
                        dp.c_cobble = c_desert_stone;
                        dp.c_moss   = c_desert_stone;
                        dp.c_stair  = c_desert_stone;
@@ -293,7 +293,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(2, 3, 2);
                        dp.roomsize      = v3s16(2, 5, 2);
                        dp.notifytype    = GENNOTIFY_TEMPLE;
-               } else if (stone_type == SANDSTONE) {
+               } else if (stone_type == MGSTONE_SANDSTONE) {
                        dp.c_cobble = c_sandstonebrick;
                        dp.c_moss   = c_sandstonebrick;
                        dp.c_stair  = c_sandstonebrick;

diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 7698af825cfc1f495bd5338f25197298efc542cf..6c1441bc2f485014320f7f3946cd3222a66374cc 100644 (file)
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -255,7 +255,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
                dp.np_density = nparams_dungeon_density;
                dp.np_wetness = nparams_dungeon_wetness;
                dp.c_water    = c_water_source;
-               if (stone_type == STONE) {
+               if (stone_type == MGSTONE_STONE) {
                        dp.c_cobble = c_cobble;
                        dp.c_moss   = c_mossycobble;
                        dp.c_stair  = c_stair_cobble;
@@ -265,7 +265,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(1, 2, 1);
                        dp.roomsize      = v3s16(0, 0, 0);
                        dp.notifytype    = GENNOTIFY_DUNGEON;
-               } else if (stone_type == DESERT_STONE) {
+               } else if (stone_type == MGSTONE_DESERT_STONE) {
                        dp.c_cobble = c_desert_stone;
                        dp.c_moss   = c_desert_stone;
                        dp.c_stair  = c_desert_stone;
@@ -275,7 +275,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(2, 3, 2);
                        dp.roomsize      = v3s16(2, 5, 2);
                        dp.notifytype    = GENNOTIFY_TEMPLE;
-               } else if (stone_type == SANDSTONE) {
+               } else if (stone_type == MGSTONE_SANDSTONE) {
                        dp.c_cobble = c_sandstonebrick;
                        dp.c_moss   = c_sandstonebrick;
                        dp.c_stair  = c_sandstonebrick;

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index ee609bc956ef6a735b3bf20bf0776742699c6de1..e6801a24b75293ad38db2838cbb8894274803675 100644 (file)
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -285,7 +285,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
                dp.np_density = nparams_dungeon_density;
                dp.np_wetness = nparams_dungeon_wetness;
                dp.c_water    = c_water_source;
-               if (stone_type == STONE) {
+               if (stone_type == MGSTONE_STONE) {
                        dp.c_cobble = c_cobble;
                        dp.c_moss   = c_mossycobble;
                        dp.c_stair  = c_stair_cobble;
@@ -295,7 +295,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(1, 2, 1);
                        dp.roomsize      = v3s16(0, 0, 0);
                        dp.notifytype    = GENNOTIFY_DUNGEON;
-               } else if (stone_type == DESERT_STONE) {
+               } else if (stone_type == MGSTONE_DESERT_STONE) {
                        dp.c_cobble = c_desert_stone;
                        dp.c_moss   = c_desert_stone;
                        dp.c_stair  = c_desert_stone;
@@ -305,7 +305,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(2, 3, 2);
                        dp.roomsize      = v3s16(2, 5, 2);
                        dp.notifytype    = GENNOTIFY_TEMPLE;
-               } else if (stone_type == SANDSTONE) {
+               } else if (stone_type == MGSTONE_SANDSTONE) {
                        dp.c_cobble = c_sandstonebrick;
                        dp.c_moss   = c_sandstonebrick;
                        dp.c_stair  = c_sandstonebrick;

diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index fa790677a638ca4c13f20f0f79caa195a5588cc5..d424ca068707e345731d5dfa52dd0e9b89f13717 100644 (file)
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -312,7 +312,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
                dp.np_density = nparams_dungeon_density;
                dp.np_wetness = nparams_dungeon_wetness;
                dp.c_water    = c_water_source;
-               if (stone_type == STONE) {
+               if (stone_type == MGSTONE_STONE) {
                        dp.c_cobble = c_cobble;
                        dp.c_moss   = c_mossycobble;
                        dp.c_stair  = c_stair_cobble;
@@ -322,7 +322,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(1, 2, 1);
                        dp.roomsize      = v3s16(0, 0, 0);
                        dp.notifytype    = GENNOTIFY_DUNGEON;
-               } else if (stone_type == DESERT_STONE) {
+               } else if (stone_type == MGSTONE_DESERT_STONE) {
                        dp.c_cobble = c_desert_stone;
                        dp.c_moss   = c_desert_stone;
                        dp.c_stair  = c_desert_stone;
@@ -332,7 +332,7 @@ void MapgenValleys::makeChunk(BlockMakeData *data)
                        dp.holesize      = v3s16(2, 3, 2);
                        dp.roomsize      = v3s16(2, 5, 2);
                        dp.notifytype    = GENNOTIFY_TEMPLE;
-               } else if (stone_type == SANDSTONE) {
+               } else if (stone_type == MGSTONE_SANDSTONE) {
                        dp.c_cobble = c_sandstonebrick;
                        dp.c_moss   = c_sandstonebrick;
                        dp.c_stair  = c_sandstonebrick;

diff --git a/src/mg_biome.h b/src/mg_biome.h
index e9378fd7926174c4ad3a59dd1fd5c0d6c8a1185e..e78e90e5f4c8eb054812c0eccfef0e7a971b5689 100644 (file)
--- a/src/mg_biome.h
+++ b/src/mg_biome.h
@@ -33,13 +33,13 @@ class BiomeManager;
 
 #define BIOME_NONE ((u8)0)
 
-enum BiomeType
-{
-       BIOME_NORMAL,
-       BIOME_LIQUID,
-       BIOME_NETHER,
-       BIOME_AETHER,
-       BIOME_FLAT
+// TODO(hmmmm): Decide whether this is obsolete or will be used in the future
+enum BiomeType {
+       BIOMETYPE_NORMAL,
+       BIOMETYPE_LIQUID,
+       BIOMETYPE_NETHER,
+       BIOMETYPE_AETHER,
+       BIOMETYPE_FLAT,
 };
 
 class Biome : public ObjDef, public NodeResolver {

diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 405b93b86149708eef5421da776966c6c4603969..6baf217af34ebe74bcdc0f2af652294c7f6bae48 100644 (file)
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -39,11 +39,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct EnumString ModApiMapgen::es_BiomeTerrainType[] =
 {
-       {BIOME_NORMAL, "normal"},
-       {BIOME_LIQUID, "liquid"},
-       {BIOME_NETHER, "nether"},
-       {BIOME_AETHER, "aether"},
-       {BIOME_FLAT,   "flat"},
+       {BIOMETYPE_NORMAL, "normal"},
+       {BIOMETYPE_LIQUID, "liquid"},
+       {BIOMETYPE_NETHER, "nether"},
+       {BIOMETYPE_AETHER, "aether"},
+       {BIOMETYPE_FLAT,   "flat"},
        {0, NULL},
 };
 
@@ -371,7 +371,7 @@ Biome *read_biome_def(lua_State *L, int index, INodeDefManager *ndef)
                return NULL;
 
        BiomeType biometype = (BiomeType)getenumfield(L, index, "type",
-               ModApiMapgen::es_BiomeTerrainType, BIOME_NORMAL);
+               ModApiMapgen::es_BiomeTerrainType, BIOMETYPE_NORMAL);
        Biome *b = BiomeManager::create(biometype);
 
        b->name            = getstringfield_default(L, index, "name", "");