Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Decoration: Change divlen to sidelen
  • Loading branch information
kwolekr committed Jun 17, 2013
1 parent 0a8519a commit 56093b6
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
5 changes: 3 additions & 2 deletions doc/lua_api.txt
Expand Up @@ -1875,8 +1875,9 @@ Decoration definition (register_decoration)
deco_type = "simple", -- See "Decoration types"
place_on = "default:dirt_with_grass",
^ Node that decoration can be placed on
divlen = 8,
^ Number of divisions made in the chunk being generated
sidelen = 8,
^ Size of divisions made in the chunk being generated.
^ If the chunk size is not evenly divisible by sidelen, sidelen is made equal to the chunk size.
fill_ratio = 0.02,
^ Ratio of the area to be uniformly filled by the decoration.
^ Used only if noise_params is not specified.
Expand Down
10 changes: 8 additions & 2 deletions src/mapgen.cpp
Expand Up @@ -232,8 +232,14 @@ void Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
int carea_size = nmax.X - nmin.X + 1;

// Divide area into parts
s16 sidelen = carea_size / divlen;
float area = sidelen * sidelen;
if (carea_size % sidelen) {
errorstream << "Decoration::placeDeco: chunk size is not divisible by "
"sidelen; setting sidelen to " << carea_size << std::endl;
sidelen = carea_size;
}

s16 divlen = carea_size / sidelen;
int area = sidelen * sidelen;

for (s16 z0 = 0; z0 < divlen; z0++)
for (s16 x0 = 0; x0 < divlen; x0++) {
Expand Down
2 changes: 1 addition & 1 deletion src/mapgen.h
Expand Up @@ -199,7 +199,7 @@ class Decoration {
int mapseed;
std::string place_on_name;
content_t c_place_on;
s16 divlen;
s16 sidelen;
float fill_ratio;
NoiseParams *np;

Expand Down
6 changes: 3 additions & 3 deletions src/script/lua_api/luaapi.cpp
Expand Up @@ -683,7 +683,7 @@ int ModApiBasic::l_register_decoration(lua_State *L)

deco->c_place_on = CONTENT_IGNORE;
deco->place_on_name = getstringfield_default(L, index, "place_on", "ignore");
deco->divlen = getintfield_default(L, index, "divlen", 8);
deco->sidelen = getintfield_default(L, index, "sidelen", 8);
deco->fill_ratio = getfloatfield_default(L, index, "fill_ratio", 0.02);

lua_getfield(L, index, "noise_params");
Expand Down Expand Up @@ -749,8 +749,8 @@ int ModApiBasic::l_register_decoration(lua_State *L)
break; }
}

if (deco->divlen <= 0) {
errorstream << "register_decoration: divlen must be "
if (deco->sidelen <= 0) {
errorstream << "register_decoration: sidelen must be "
"greater than 0" << std::endl;
delete deco;
return 0;
Expand Down

0 comments on commit 56093b6

Please sign in to comment.