Fix sound handling

This fixes a crash in 5.2.0
gpcf · Apr 6, 2020 · 1e4b737 · 1e4b737
1 parent 777c87c
commit 1e4b737
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/nodes_feldweg.lua b/nodes_feldweg.lua
@@ -68,7 +68,7 @@ if( cottages_feldweg_mode == "simple" or cottages_feldweg_mode == "flat" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly=1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 	})
 end
@@ -86,7 +86,7 @@ if( cottages_feldweg_mode == "flat" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 	})
 
@@ -96,7 +96,7 @@ if( cottages_feldweg_mode == "flat" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 	})
 
@@ -106,7 +106,7 @@ if( cottages_feldweg_mode == "flat" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 	})
 
@@ -121,7 +121,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
 		paramtype2 = "facedir",
 		roups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		drawtype = "nodebox",
                 -- top, bottom, side1, side2, inner, outer
@@ -152,7 +152,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		drawtype = "nodebox",
                 -- top, bottom, side1, side2, inner, outer
@@ -196,7 +196,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		drawtype = "nodebox",
                 -- top, bottom, side1, side2, inner, outer
@@ -238,7 +238,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		drawtype = "nodebox",
                 -- top, bottom, side1, side2, inner, outer
@@ -288,7 +288,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
 			"default_dirt.png", "default_grass.png",
@@ -305,7 +305,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		tiles = {"cottages_feldweg_end.png","default_dirt.png",
 			"default_grass.png","cottages_feldweg_surface.png",
@@ -322,7 +322,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png", "default_dirt.png",
 			"default_grass.png","cottages_feldweg_surface.png",
@@ -339,7 +339,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		tiles = {"default_dirt.png^default_grass_side.png","default_grass.png",
 			"default_dirt.png^default_grass_side.png","cottages_feldweg_surface.png",
@@ -356,7 +356,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
 			"default_dirt.png", "default_grass.png",
@@ -381,7 +381,7 @@ if( minetest.get_modpath("stairs") and stairs and stairs.register_stair_and_slab
 		{"cottages_feldweg.png","default_dirt.png", "default_grass.png","default_grass.png","cottages_feldweg.png","cottages_feldweg.png"},
 		S("Dirt Road Stairs"),
 		S("Dirt Road, half height"),
-		default.node_sound_dirt_defaults)
+		default.node_sound_dirt_defaults())
 end
 
 if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
@@ -409,7 +409,7 @@ if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
 			"default_dirt.png", "default_grass.png",
@@ -430,7 +430,7 @@ if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
 		paramtype2 = "facedir",
 		groups = {crumbly = 3, snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, bike_friendly = 1},
 		legacy_facedir_simple = true,
-		sounds = default.node_sound_dirt_defaults,
+		sounds = default.node_sound_dirt_defaults(),
 		is_ground_content = false,
 		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
 			"default_dirt.png", "default_grass.png",

diff --git a/nodes_furniture.lua b/nodes_furniture.lua
@@ -23,7 +23,7 @@ minetest.register_node("cottages:bed_foot", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -58,7 +58,7 @@ minetest.register_node("cottages:bed_head", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -99,7 +99,7 @@ minetest.register_node("cottages:sleeping_mat", {
         paramtype2 = "facedir",
         walkable = false,
         groups = { snappy = 3 },
-        sounds = default.node_sound_leaves_defaults,
+        sounds = default.node_sound_leaves_defaults(),
         selection_box = {
                         type = "wallmounted",
                         },
@@ -133,7 +133,7 @@ minetest.register_node("cottages:sleeping_mat_head", {
         paramtype = 'light',
         paramtype2 = "facedir",
         groups = { snappy = 3 },
-        sounds = default.node_sound_leaves_defaults,
+        sounds = default.node_sound_leaves_defaults(),
         node_box = {
                 type = "fixed",
                 fixed = {
@@ -162,7 +162,7 @@ minetest.register_node("cottages:bench", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -1090,4 +1090,4 @@ minetest.register_craft({
 		{ cottages.craftitem_steel,	cottages.craftitem_chest,	cottages.craftitem_steel},
 		{ cottages.craftitem_wood,	cottages.craftitem_wood,	cottages.craftitem_wood },
 	},
-})
+})
diff --git a/nodes_historic.lua b/nodes_historic.lua
@@ -27,7 +27,7 @@ minetest.register_node("cottages:wagon_wheel", {
 	},
 	groups = {choppy=2,dig_immediate=2,attached_node=1},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_defaults,
+	sounds = default.node_sound_defaults(),
 	is_ground_content = false,
 })
 
@@ -38,7 +38,7 @@ minetest.register_node("cottages:loam", {
 	tiles = {"cottages_loam.png"},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	groups = {crumbly=3},
-	sounds = default.node_sound_dirt_defaults,
+	sounds = default.node_sound_dirt_defaults(),
 	is_ground_content = false,
 })
 
@@ -53,7 +53,7 @@ minetest.register_node("cottages:straw_ground", {
 	description = S("Straw ground for animals"),
 	tiles = {"cottages_darkage_straw.png","cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png"},
 	groups = {snappy=2,crumbly=3,choppy=2,oddly_breakable_by_hand=2},
-	sounds = default.node_sound_dirt_defaults,
+	sounds = default.node_sound_dirt_defaults(),
 	is_ground_content = false,
 })
 

diff --git a/nodes_mining.lua b/nodes_mining.lua
@@ -57,7 +57,7 @@ minetest.register_node("cottages:ladder_with_rope_and_rail", {
 -- 	groups = {choppy=2,oddly_breakable_by_hand=3,rail=1,connect_to_raillike=1}, --connect_to_raillike=minetest.raillike_group("rail")},
 	groups = {choppy=2,oddly_breakable_by_hand=3,rail=1,connect_to_raillike=minetest.raillike_group("rail")},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 

diff --git a/nodes_roof.lua b/nodes_roof.lua
@@ -303,7 +303,7 @@ minetest.register_node("cottages:slate_vertical", {
                cottages.texture_roof_sides, "cottages_slate.png"},
 	paramtype2 = "facedir",
 	groups = {cracky = 2, roof = 1},
-	sounds = default.node_sound_stone_defaults,
+	sounds = default.node_sound_stone_defaults(),
 	is_ground_content = false,
 })
 
@@ -325,7 +325,7 @@ minetest.register_node("cottages:roof_vertical_asphalt", {
                cottages.texture_roof_sides, "cottages_homedecor_shingles_asphalt.png"},
 	paramtype2 = "facedir",
 	groups = {cracky = 2, roof = 1},
-	sounds = default.node_sound_stone_defaults,
+	sounds = default.node_sound_stone_defaults(),
 	is_ground_content = false,
 })
 
@@ -348,7 +348,7 @@ minetest.register_node("cottages:roof_vertical_terracotta", {
                cottages.texture_roof_sides, "cottages_homedecor_shingles_terracotta.png"},
 	paramtype2 = "facedir",
 	groups = {cracky = 2, roof = 1},
-	sounds = default.node_sound_stone_defaults,
+	sounds = default.node_sound_stone_defaults(),
 	is_ground_content = false,
 })
 
@@ -371,7 +371,7 @@ minetest.register_node("cottages:roof_vertical_wood", {
                cottages.texture_roof_sides, cottages.textures_roof_wood},
 	paramtype2 = "facedir",
 	groups = {cracky = 2, roof = 1},
-	sounds = default.node_sound_stone_defaults,
+	sounds = default.node_sound_stone_defaults(),
 	is_ground_content = false,
 })
 
@@ -394,7 +394,7 @@ minetest.register_node("cottages:roof_vertical_brown", {
                cottages.texture_roof_sides, "cottages_homedecor_shingles_wood.png"},
 	paramtype2 = "facedir",
 	groups = {cracky = 2, roof = 1},
-	sounds = default.node_sound_stone_defaults,
+	sounds = default.node_sound_stone_defaults(),
 	is_ground_content = false,
 })
 
@@ -417,7 +417,7 @@ minetest.register_node("cottages:roof_vertical_shingle", {
                cottages.texture_roof_sides, "cottages_homedecor_shingles_misc_wood.png"},
 	paramtype2 = "facedir",
 	groups = {cracky = 2, roof = 1},
-	sounds = default.node_sound_stone_defaults,
+	sounds = default.node_sound_stone_defaults(),
 	is_ground_content = false,
 })
 
@@ -443,7 +443,7 @@ minetest.register_node("cottages:reet", {
 	description = S("Reed for thatching"),
 	tiles = {"cottages_reet.png"},
 	groups = {snappy = 3, choppy = 3, oddly_breakable_by_hand = 3, flammable = 3, roof = 1},
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 	is_ground_content = false,
 })
 

diff --git a/nodes_straw.lua b/nodes_straw.lua
@@ -32,7 +32,7 @@ minetest.register_node("cottages:straw_mat", {
 	paramtype2 = "facedir",
 	walkable = false,
 	groups = {hay = 3, snappy = 2, oddly_breakable_by_hand = 2, flammable = 3},
-	sounds = default.node_sound_leaves_defaults,
+	sounds = default.node_sound_leaves_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -58,7 +58,7 @@ minetest.register_node("cottages:straw_bale", {
 	tiles = {"cottages_darkage_straw_bale.png"},
 	paramtype = "light",
 	groups = {hay = 3, snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, roof = 1},
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 	-- the bale is slightly smaller than a full node
 	node_box = {
 		type = "fixed",
@@ -81,7 +81,7 @@ minetest.register_node("cottages:straw", {
 	description = S("Straw block"),
 	tiles = {"cottages_darkage_straw.png"},
 	groups = {hay = 3, snappy = 3, choppy = 3, oddly_breakable_by_hand = 3, flammable = 3, roof = 1},
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 	-- the bale is slightly smaller than a full node
 	is_ground_content = false,
 })
@@ -92,7 +92,7 @@ minetest.register_node("cottages:straw_dark", {
 	description = S("Dark straw block"),
 	tiles = {"cottages_dark_straw.png"},
 	groups = {hay = 3, snappy = 3, choppy = 3, oddly_breakable_by_hand = 3, flammable = 3, roof = 1},
-	sounds = default.node_sound_wood_defaults,
+	sounds = default.node_sound_wood_defaults(),
 	-- the bale is slightly smaller than a full node
 	is_ground_content = false,
 })