From 0b77588e87b0eeedd624eb0d6c2559aad10104ad Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Fri, 2 Aug 2013 00:29:27 +0200
Subject: Allow multiple 'wherein' nodes in oredef

---
 src/mapgen.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mapgen.h')

diff --git a/src/mapgen.h b/src/mapgen.h
index b167978d7..8aff33288 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -149,9 +149,9 @@ enum OreType {
 class Ore {
 public:
 	std::string ore_name;
-	std::string wherein_name;
+	std::vector<std::string> wherein_names;
 	content_t ore;
-	content_t wherein;  // the node to be replaced
+	std::vector<content_t> wherein;  // the node to be replaced
 	u32 clust_scarcity; // ore cluster has a 1-in-clust_scarcity chance of appearing at a node
 	s16 clust_num_ores; // how many ore nodes are in a chunk
 	s16 clust_size;     // how large (in nodes) a chunk of ore is
@@ -165,7 +165,6 @@ public:
 	
 	Ore() {
 		ore     = CONTENT_IGNORE;
-		wherein = CONTENT_IGNORE;
 		np      = NULL;
 		noise   = NULL;
 	}
-- 
cgit v1.2.3