diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-12-10 00:56:44 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-12-10 00:56:44 -0500 |
| commit | cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e (patch) | |
| tree | 38fc831ee02f25810b1134a8fbdb0d871ef0a1d4 /src/script/lua_api | |
| parent | fb2bc956b18bd70a47bff00d5726d4754867856a (diff) | |
| download | minetest-cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e.tar.gz minetest-cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e.tar.bz2 minetest-cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e.zip | |
Remove get_noiseparams function. read_noiseparams should be used from now on
Diffstat (limited to 'src/script/lua_api')
| -rw-r--r-- | src/script/lua_api/l_mapgen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index 3176b920c..03a2ee0d5 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -394,9 +394,12 @@ int ModApiMapgen::l_register_decoration(lua_State *L) for (size_t i = 0; i != place_on_names.size(); i++) resolver->addNodeList(place_on_names[i], &deco->c_place_on); + getflagsfield(L, index, "flags", flagdesc_deco, &deco->flags, NULL); + //// Get NoiseParams to define how decoration is placed lua_getfield(L, index, "noise_params"); - deco->np = get_noiseparams(L, -1); + if (read_noiseparams(L, -1, &deco->np)) + deco->flags |= DECO_USE_NOISE; lua_pop(L, 1); //// Get biomes associated with this decoration (if any) @@ -482,9 +485,6 @@ bool ModApiMapgen::regDecoSchematic(lua_State *L, INodeDefManager *ndef, { int index = 1; - deco->flags = 0; - getflagsfield(L, index, "flags", flagdesc_deco_schematic, &deco->flags, NULL); - deco->rotation = (Rotation)getenumfield(L, index, "rotation", es_Rotation, ROTATE_0); |