summaryrefslogtreecommitdiff
path: root/src/mapgen.h
diff options
context:
space:
mode:
authorPilzAdam <pilzadam@minetest.net>2013-08-02 00:29:27 +0200
committerPilzAdam <pilzadam@minetest.net>2013-08-02 00:55:16 +0200
commit0b77588e87b0eeedd624eb0d6c2559aad10104ad (patch)
tree35614cde27a84348ea258af264c96135b864b0c3 /src/mapgen.h
parent06cdce1e1231fb5946ac9750f9b53b53c6f7e5f8 (diff)
downloadminetest-0b77588e87b0eeedd624eb0d6c2559aad10104ad.tar.gz
minetest-0b77588e87b0eeedd624eb0d6c2559aad10104ad.tar.bz2
minetest-0b77588e87b0eeedd624eb0d6c2559aad10104ad.zip
Allow multiple 'wherein' nodes in oredef
Diffstat (limited to 'src/mapgen.h')
-rw-r--r--src/mapgen.h5
1 files changed, 2 insertions, 3 deletions
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;
}