BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Rename and repurpose minetest.set_noiseparam_defaults to set_noiseparams

Browse Source
This commit is contained in:
kwolekr 2014-12-09 23:44:04 -05:00
parent f2c18511a4
commit d50878d608
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/lua_api.txt
View File

@ -1547,10 +1547,10 @@ minetest.set_mapgen_params(MapgenParams)
^ Leave field unset to leave that parameter unchanged ^ Leave field unset to leave that parameter unchanged
^ flags contains a comma-delimited string of flags to set, or if the prefix "no" is attached, clears instead. ^ flags contains a comma-delimited string of flags to set, or if the prefix "no" is attached, clears instead.
^ flags is in the same format and has the same options as 'mg_flags' in minetest.conf ^ flags is in the same format and has the same options as 'mg_flags' in minetest.conf
minetest.set_noiseparam_defaults({np1=NoiseParams, np2= NoiseParams, ...}) minetest.set_noiseparams(name, noiseparams, set_default)
^ Sets the default value of a noiseparam setting ^ Sets the noiseparams setting of 'name' to the noiseparams table specified in 'noiseparams'.
^ Takes a table as an argument that maps one or more setting names to NoiseParams structures ^ 'set_default', is an optional boolean (default of true) that specifies whether the setting
^ Possible setting names consist of any NoiseParams setting exposed through the global settings ^ should be applied to the default config or current active config
minetest.clear_objects() minetest.clear_objects()
^ clear all objects in the environments ^ clear all objects in the environments
minetest.line_of_sight(pos1, pos2, stepsize) -> true/false, pos minetest.line_of_sight(pos1, pos2, stepsize) -> true/false, pos

31
src/script/lua_api/l_mapgen.cpp
View File

@ -262,32 +262,19 @@ int ModApiMapgen::l_set_mapgen_params(lua_State *L)
return 0; return 0;
} }
// set_noiseparam_defaults({np1={noise params}, ...}) // set_noiseparams(name, noiseparams, set_default)
// set default values for noise parameters if not present in global settings // set global config values for noise parameters
int ModApiMapgen::l_set_noiseparam_defaults(lua_State *L) int ModApiMapgen::l_set_noiseparams(lua_State *L)
{ {
NoiseParams np; const char *name = luaL_checkstring(L, 1);
std::string val, name;
if (!lua_istable(L, 1)) NoiseParams np;
if (!read_noiseparams(L, 2, &np))
return 0; return 0;
lua_pushnil(L); bool set_default = lua_isboolean(L, 3) ? lua_toboolean(L, 3) : true;
while (lua_next(L, 1)) {
if (read_noiseparams(L, -1, &np)) {
/// TODO(hmmmm): Update this for newer noiseparam formats
/// Right now this is safe because serializeStructToString() won't
/// touch memory outside of what the format string specifies
if (!serializeStructToString(&val, NOISEPARAMS_FMT_STR, &np))
continue;
if (!lua_isstring(L, -2))
continue;
name = lua_tostring(L, -2); g_settings->setNoiseParams(name, np, set_default);
g_settings->setDefault(name, val);
}
lua_pop(L, 1);
}
return 0; return 0;
} }
@ -682,7 +669,7 @@ void ModApiMapgen::Initialize(lua_State *L, int top)
API_FCT(get_mapgen_object); API_FCT(get_mapgen_object);
API_FCT(set_mapgen_params); API_FCT(set_mapgen_params);
API_FCT(set_noiseparam_defaults); API_FCT(set_noiseparams);
API_FCT(set_gen_notify); API_FCT(set_gen_notify);
API_FCT(register_biome); API_FCT(register_biome);

4
src/script/lua_api/l_mapgen.h
View File

@ -37,8 +37,8 @@ private:
// set mapgen parameters // set mapgen parameters
static int l_set_mapgen_params(lua_State *L); static int l_set_mapgen_params(lua_State *L);
// set_noiseparam_defaults({np1={noise params}, ...}) // set_noiseparam_defaults(name, noiseparams, set_default)
static int l_set_noiseparam_defaults(lua_State *L); static int l_set_noiseparams(lua_State *L);
// set_gen_notify(flagstring) // set_gen_notify(flagstring)
static int l_set_gen_notify(lua_State *L); static int l_set_gen_notify(lua_State *L);