Mapgen: Use mapgen-specific names for constants in headers

Update copyright years in all mapgens
Add myself to copyright notices in mgv5 and mgv7

diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index a8b84e849722032c80242ba88455ed4185e9ae03..8b6c25a59ea8065fd25245441733a18af76b3ee3 100644 (file)
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by

diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h
index 35f2ba3851738f1c8b77ca0f4aa2e269a8a5c6c2..bd3576dc3780fe616894adfc9aa81ea055948751 100644 (file)
--- a/src/mapgen_singlenode.h
+++ b/src/mapgen_singlenode.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by

diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 1e5e5dbf03cca32ca2820ba23d6b5538cef10b03..10e9f5e65993b0147466546710f39721246408b3 100644 (file)
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 paramat, Matt Gregory
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -527,7 +528,7 @@ void MapgenV5::generateCaves(int max_stone_y)
                }
        }
 
-       if (node_max.Y > LARGE_CAVE_DEPTH)
+       if (node_max.Y > MGV5_LARGE_CAVE_DEPTH)
                return;
 
        PseudoRandom ps(blockseed + 21343);

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index a6fdc2b2b8eac6c13adfc9ff79cd9867c2e0ce6a..4112bbfa61135db551bba763ac3788eba8913b2e 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 paramat, Matt Gregory
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -22,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapgen.h"
 
-#define LARGE_CAVE_DEPTH -256
+#define MGV5_LARGE_CAVE_DEPTH -256
 
 class BiomeManager;
 

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index 5a04a2d1786934f29e7a7d55bac9a6d973d5754d..82ed6c4d4ee2272f6e85082e09600947f635e95b 100644 (file)
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -304,13 +304,13 @@ float MapgenV6::baseTerrainLevelFromMap(int index)
 
 s16 MapgenV6::find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision)
 {
-       return baseTerrainLevelFromNoise(p2d) + AVERAGE_MUD_AMOUNT;
+       return baseTerrainLevelFromNoise(p2d) + MGV6_AVERAGE_MUD_AMOUNT;
 }
 
 
 int MapgenV6::getGroundLevelAtPoint(v2s16 p)
 {
-       return baseTerrainLevelFromNoise(p) + AVERAGE_MUD_AMOUNT;
+       return baseTerrainLevelFromNoise(p) + MGV6_AVERAGE_MUD_AMOUNT;
 }
 
 
@@ -387,7 +387,7 @@ bool MapgenV6::getHaveAppleTree(v2s16 p)
 float MapgenV6::getMudAmount(int index)
 {
        if (flags & MG_FLAT)
-               return AVERAGE_MUD_AMOUNT;
+               return MGV6_AVERAGE_MUD_AMOUNT;
 
        /*return ((float)AVERAGE_MUD_AMOUNT + 2.0 * noise2d_perlin(
                        0.5+(float)p.X/200, 0.5+(float)p.Y/200,
@@ -422,13 +422,13 @@ BiomeV6Type MapgenV6::getBiome(int index, v2s16 p)
        if (spflags & MGV6_SNOWBIOMES) {
                float blend = (spflags & MGV6_BIOMEBLEND) ? noise2d(p.X, p.Y, seed) / 40 : 0;
 
-               if (d > FREQ_HOT + blend) {
-                       if (h > FREQ_JUNGLE + blend)
+               if (d > MGV6_FREQ_HOT + blend) {
+                       if (h > MGV6_FREQ_JUNGLE + blend)
                                return BT_JUNGLE;
                        else
                                return BT_DESERT;
-               } else if (d < FREQ_SNOW + blend) {
-                       if (h > FREQ_TAIGA + blend)
+               } else if (d < MGV6_FREQ_SNOW + blend) {
+                       if (h > MGV6_FREQ_TAIGA + blend)
                                return BT_TAIGA;
                        else
                                return BT_TUNDRA;
@@ -646,11 +646,11 @@ int MapgenV6::generateGround()
                for (s16 y = node_min.Y; y <= node_max.Y; y++) {
                        if (vm->m_data[i].getContent() == CONTENT_IGNORE) {
                                if (y <= surface_y) {
-                                       vm->m_data[i] = (y >= DESERT_STONE_BASE
+                                       vm->m_data[i] = (y >= MGV6_DESERT_STONE_BASE
                                                        && bt == BT_DESERT) ?
                                                n_desert_stone : n_stone;
                                } else if (y <= water_level) {
-                                       vm->m_data[i] = (y >= ICE_BASE
+                                       vm->m_data[i] = (y >= MGV6_ICE_BASE
                                                        && bt == BT_TUNDRA) ?
                                                n_ice : n_water_source;
                                } else {

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index c71cf3c535fb0e1fbc83800fc861002340e94427..685fdad7e298eb4b772955b609a5978f71114406 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -23,13 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen.h"
 #include "noise.h"
 
-#define AVERAGE_MUD_AMOUNT 4
-#define DESERT_STONE_BASE -32
-#define ICE_BASE 0
-#define FREQ_HOT 0.4
-#define FREQ_SNOW -0.4
-#define FREQ_TAIGA 0.5
-#define FREQ_JUNGLE 0.5
+#define MGV6_AVERAGE_MUD_AMOUNT 4
+#define MGV6_DESERT_STONE_BASE -32
+#define MGV6_ICE_BASE 0
+#define MGV6_FREQ_HOT 0.4
+#define MGV6_FREQ_SNOW -0.4
+#define MGV6_FREQ_TAIGA 0.5
+#define MGV6_FREQ_JUNGLE 0.5
 
 //////////// Mapgen V6 flags
 #define MGV6_JUNGLES    0x01

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 7ed4bc5165233645d33bbe211c34afa486bb58da..77b9721c782557b8baed72546ecec3a07e2c48b7 100644 (file)
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 paramat, Matt Gregory
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index c0cfa8c77774c7bccc49d88ba4a62f2ba0f69b38..9b483b0410ee62f7b8936ae84b7f19e7f5c43269 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 paramat, Matt Gregory
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by