]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Fix spaces generated by settings file generator
authorShadowNinja <shadowninja@minetest.net>
Tue, 1 Feb 2022 01:00:14 +0000 (20:00 -0500)
committerrubenwardy <rw@rubenwardy.com>
Fri, 8 Apr 2022 13:55:21 +0000 (14:55 +0100)
builtin/mainmenu/generate_from_settingtypes.lua

index 43fc57bb99030918c3592b7c5c47a61c5c07a15a..4fcaa7076a77c5ac6d31ecf90154c3ea65b4391a 100644 (file)
@@ -31,7 +31,7 @@ local group_format_template = [[
 #    octaves     = %s,
 #    persistence = %s,
 #    lacunarity  = %s,
-#    flags       = %s
+#    flags       =%s
 # }
 
 ]]
@@ -55,7 +55,11 @@ local function create_minetest_conf_example()
                        end
                        if entry.comment ~= "" then
                                for _, comment_line in ipairs(entry.comment:split("\n", true)) do
-                                       insert(result, "#    " .. comment_line .. "\n")
+                                       if comment_line == "" then
+                                               insert(result, "#\n")
+                                       else
+                                               insert(result, "#    " .. comment_line .. "\n")
+                                       end
                                end
                        end
                        insert(result, "#    type: " .. entry.type)
@@ -73,10 +77,14 @@ local function create_minetest_conf_example()
                        end
                        insert(result, "\n")
                        if group_format == true then
+                               local flags = entry.values[10]
+                               if flags ~= "" then
+                                       flags = " "..flags
+                               end
                                insert(result, sprintf(group_format_template, entry.name, entry.values[1],
                                                entry.values[2], entry.values[3], entry.values[4], entry.values[5],
                                                entry.values[6], entry.values[7], entry.values[8], entry.values[9],
-                                               entry.values[10]))
+                                               flags))
                        else
                                local append
                                if entry.default ~= "" then
@@ -126,4 +134,3 @@ file = assert(io.open("src/settings_translation_file.cpp", "w"))
 --file = assert(io.open("settings_translation_file.cpp", "w"))
 file:write(create_translation_file())
 file:close()
-