aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
Diffstat (limited to 'builtin')
-rw-r--r--builtin/mainmenu/tab_settings.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua
index e6d6c6dd7..463a5e90b 100644
--- a/builtin/mainmenu/tab_settings.lua
+++ b/builtin/mainmenu/tab_settings.lua
@@ -106,7 +106,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
default = default,
min = min,
max = max,
- comment = settings.current_comment,
+ comment = current_comment,
})
return
end
@@ -128,7 +128,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
readable_name = readable_name,
type = setting_type,
default = default,
- comment = settings.current_comment,
+ comment = current_comment,
})
return
end
@@ -143,7 +143,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
readable_name = readable_name,
type = "bool",
default = remaining_line,
- comment = settings.current_comment,
+ comment = current_comment,
})
return
end
@@ -169,7 +169,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
default = default,
min = min,
max = max,
- comment = settings.current_comment,
+ comment = current_comment,
})
return
end
@@ -187,7 +187,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
type = "enum",
default = default,
values = values:split(",", true),
- comment = settings.current_comment,
+ comment = current_comment,
})
return
end
@@ -204,7 +204,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
readable_name = readable_name,
type = "path",
default = default,
- comment = settings.current_comment,
+ comment = current_comment,
})
return
end
@@ -225,7 +225,7 @@ local function parse_setting_line(settings, line, read_all, base_level, allow_se
type = "flags",
default = default,
possible = possible,
- comment = settings.current_comment,
+ comment = current_comment,
})
return
end
kwd">random_turn(PseudoRandom &random, v3s16 olddir); int dir_to_facedir(v3s16 d); struct DungeonParams { s32 seed; content_t c_water; content_t c_river_water; content_t c_wall; content_t c_alt_wall; content_t c_stair; bool diagonal_dirs; bool only_in_ground; v3s16 holesize; u16 corridor_len_min; u16 corridor_len_max; v3s16 room_size_min; v3s16 room_size_max; v3s16 room_size_large_min; v3s16 room_size_large_max; u16 rooms_min; u16 rooms_max; s16 y_min; s16 y_max; GenNotifyType notifytype; NoiseParams np_density; NoiseParams np_alt_wall; }; class DungeonGen { public: MMVManip *vm; INodeDefManager *ndef; GenerateNotifier *gennotify; u32 blockseed; PseudoRandom random; v3s16 csize; content_t c_torch; DungeonParams dp; // RoomWalker v3s16 m_pos; v3s16 m_dir; DungeonGen(INodeDefManager *ndef, GenerateNotifier *gennotify, DungeonParams *dparams); void generate(MMVManip *vm, u32 bseed, v3s16 full_node_min, v3s16 full_node_max); void makeDungeon(v3s16 start_padding); void makeRoom(v3s16 roomsize, v3s16 roomplace); void makeCorridor(v3s16 doorplace, v3s16 doordir, v3s16 &result_place, v3s16 &result_dir); void makeDoor(v3s16 doorplace, v3s16 doordir); void makeFill(v3s16 place, v3s16 size, u8 avoid_flags, MapNode n, u8 or_flags); void makeHole(v3s16 place); bool findPlaceForDoor(v3s16 &result_place, v3s16 &result_dir); bool findPlaceForRoomDoor(v3s16 roomsize, v3s16 &result_doorplace, v3s16 &result_doordir, v3s16 &result_roomplace); inline void randomizeDir() { m_dir = rand_ortho_dir(random, dp.diagonal_dirs); } }; extern NoiseParams nparams_dungeon_density; extern NoiseParams nparams_dungeon_alt_wall; #endif