diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-11-14 02:58:56 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-11-14 03:07:12 -0500 |
| commit | 8d3a68f343777c438b9caf9f646e913d4b66e046 (patch) | |
| tree | c69c8b6d0fd2570451f7d56e72faa75d06130638 /src/script | |
| parent | 5b8855e83c0d1cc7aef21492e7fe862b7d06917e (diff) | |
| download | minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.tar.gz minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.tar.bz2 minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.zip | |
Fix warnings and other misc. minor changes
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/lua_api/l_mapgen.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index 71b1f4740..89bf8dadb 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -38,11 +38,11 @@ with this program; if not, write to the Free Software Foundation, Inc., struct EnumString ModApiMapgen::es_BiomeTerrainType[] = { - {BIOME_TERRAIN_NORMAL, "normal"}, - {BIOME_TERRAIN_LIQUID, "liquid"}, - {BIOME_TERRAIN_NETHER, "nether"}, - {BIOME_TERRAIN_AETHER, "aether"}, - {BIOME_TERRAIN_FLAT, "flat"}, + {BIOME_TYPE_NORMAL, "normal"}, + {BIOME_TYPE_LIQUID, "liquid"}, + {BIOME_TYPE_NETHER, "nether"}, + {BIOME_TYPE_AETHER, "aether"}, + {BIOME_TYPE_FLAT, "flat"}, {0, NULL}, }; @@ -312,9 +312,9 @@ int ModApiMapgen::l_register_biome(lua_State *L) NodeResolver *resolver = getServer(L)->getNodeDefManager()->getResolver(); BiomeManager *bmgr = getServer(L)->getEmergeManager()->biomemgr; - enum BiomeTerrainType terrain = (BiomeTerrainType)getenumfield(L, index, - "terrain_type", es_BiomeTerrainType, BIOME_TERRAIN_NORMAL); - Biome *b = bmgr->create(terrain); + enum BiomeType biometype = (BiomeType)getenumfield(L, index, "type", + es_BiomeTerrainType, BIOME_TYPE_NORMAL); + Biome *b = bmgr->create(biometype); b->name = getstringfield_default(L, index, "name", ""); b->depth_top = getintfield_default(L, index, "depth_top", 1); |