diff options
| author | Paramat <paramat@users.noreply.github.com> | 2020-05-20 22:16:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 22:16:14 +0100 |
| commit | 42fcfb75e85523a2fa5d99a453c2fabc2c04c0f6 (patch) | |
| tree | 5a76856ca96330263cce9fae1985172b671c8324 /src/script/lua_api | |
| parent | c47a680db7f3c2f241cc444a1257607492872412 (diff) | |
| download | minetest-42fcfb75e85523a2fa5d99a453c2fabc2c04c0f6.tar.gz minetest-42fcfb75e85523a2fa5d99a453c2fabc2c04c0f6.tar.bz2 minetest-42fcfb75e85523a2fa5d99a453c2fabc2c04c0f6.zip | |
Allow more than 255 biomes, document new maximum (#9855)
Change biomemap data type from u8 to u16.
New technical (not practical) maximum is 65535 biomes.
Diffstat (limited to 'src/script/lua_api')
| -rw-r--r-- | src/script/lua_api/l_mapgen.cpp | 4 | ||||
| -rw-r--r-- | src/script/lua_api/l_mapgen.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index 584085428..834938e56 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -97,7 +97,7 @@ Biome *get_or_load_biome(lua_State *L, int index, BiomeManager *biomemgr); Biome *read_biome_def(lua_State *L, int index, const NodeDefManager *ndef); size_t get_biome_list(lua_State *L, int index, - BiomeManager *biomemgr, std::unordered_set<u8> *biome_id_list); + BiomeManager *biomemgr, std::unordered_set<biome_t> *biome_id_list); Schematic *get_or_load_schematic(lua_State *L, int index, SchematicManager *schemmgr, StringMap *replace_names); @@ -425,7 +425,7 @@ Biome *read_biome_def(lua_State *L, int index, const NodeDefManager *ndef) size_t get_biome_list(lua_State *L, int index, - BiomeManager *biomemgr, std::unordered_set<u8> *biome_id_list) + BiomeManager *biomemgr, std::unordered_set<biome_t> *biome_id_list) { if (index < 0) index = lua_gettop(L) + 1 + index; diff --git a/src/script/lua_api/l_mapgen.h b/src/script/lua_api/l_mapgen.h index 4a6a9ccf4..0bdc56fc5 100644 --- a/src/script/lua_api/l_mapgen.h +++ b/src/script/lua_api/l_mapgen.h @@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "lua_api/l_base.h" +typedef u16 biome_t; // copy from mg_biome.h to avoid an unnecessary include + class ModApiMapgen : public ModApiBase { private: |