From: Calinou <calinou@opmbx.org>
Date: Thu, 4 Jun 2015 14:33:44 +0000 (+0200)
Subject: Remove deprecated ore generation code
X-Git-Tag: 0.4.13~58
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6919d43d025a26b9ad795283273aa4e5380a78ec;p=oweals%2Fminetest_game.git

Remove deprecated ore generation code
---

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 3dc6f611..378614e2 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -709,53 +709,3 @@ end
 
 
 minetest.register_on_generated(default.generate_nyancats)
-
-
---
--- Deprecated ore generation code
---
-
-
-function default.generate_ore(name, wherein, minp, maxp, seed,
-		chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max)
-	minetest.log('action', "WARNING: default.generate_ore is deprecated")
-
-	if maxp.y < height_min or minp.y > height_max then
-		return
-	end
-	local y_min = math.max(minp.y, height_min)
-	local y_max = math.min(maxp.y, height_max)
-	if chunk_size >= y_max - y_min + 1 then
-		return
-	end
-	local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
-	local pr = PseudoRandom(seed)
-	local num_chunks = math.floor(chunks_per_volume * volume)
-	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
-	--print("generate_ore num_chunks: "..dump(num_chunks))
-	for i=1,num_chunks do
-		local y0 = pr:next(y_min, y_max-chunk_size+1)
-		if y0 >= height_min and y0 <= height_max then
-			local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
-			local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
-			local p0 = {x=x0, y=y0, z=z0}
-			for x1=0,chunk_size-1 do
-			for y1=0,chunk_size-1 do
-			for z1=0,chunk_size-1 do
-				if pr:next(1,inverse_chance) == 1 then
-					local x2 = x0+x1
-					local y2 = y0+y1
-					local z2 = z0+z1
-					local p2 = {x=x2, y=y2, z=z2}
-					if minetest.get_node(p2).name == wherein then
-						minetest.set_node(p2, {name=name})
-					end
-				end
-			end
-			end
-			end
-		end
-	end
-	--print("generate_ore done")
-end
-