Mapgen: Use mapgen-specific names for constants in headers

[dragonfireclient.git] / src / mapgen_v7.cpp

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 92f3f49c4458002b080b2aee3ad420b4c9392d75..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
@@ -181,7 +182,7 @@ void MapgenV7Params::readParams(const Settings *settings)
 
 void MapgenV7Params::writeParams(Settings *settings) const
 {
-       settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, (u32)-1);
+       settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, U32_MAX);
 
        settings->setNoiseParams("mgv7_np_terrain_base",    np_terrain_base);
        settings->setNoiseParams("mgv7_np_terrain_alt",     np_terrain_alt);
@@ -636,7 +637,7 @@ MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
 
                // If there is air or water above enable top/filler placement, otherwise force
                // nplaced to stone level by setting a number exceeding any possible filler depth.
-               u16 nplaced = (air_above || water_above) ? 0 : (u16)-1;
+               u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
 
                for (s16 y = node_max.Y; y >= node_min.Y; y--) {
                        content_t c = vm->m_data[vi].getContent();
@@ -673,7 +674,7 @@ MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
                                // This is done by aborting the cycle of top/filler placement
                                // immediately by forcing nplaced to stone level.
                                if (c_below == CONTENT_AIR || c_below == c_water_source)
-                                       nplaced = (u16)-1;
+                                       nplaced = U16_MAX;
 
                                if (nplaced < depth_top) {
                                        vm->m_data[vi] = MapNode(biome->c_top);
@@ -698,7 +699,7 @@ MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
                                air_above = true;
                                water_above = false;
                        } else {  // Possible various nodes overgenerated from neighbouring mapchunks
-                               nplaced = (u16)-1;  // Disable top/filler placement
+                               nplaced = U16_MAX;  // Disable top/filler placement
                                air_above = false;
                                water_above = false;
                        }