diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-10-04 02:50:04 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-10-04 04:00:16 -0400 |
| commit | f0cd5da687ca216b4bdd9abe7bc8038a679d3763 (patch) | |
| tree | 329909b22c4494a2df2249c5697acb961b0fc527 /src/mapgen_v7.cpp | |
| parent | b12bdcce348323247811b9a0299e2e9294991d13 (diff) | |
| download | minetest-f0cd5da687ca216b4bdd9abe7bc8038a679d3763.tar.gz minetest-f0cd5da687ca216b4bdd9abe7bc8038a679d3763.tar.bz2 minetest-f0cd5da687ca216b4bdd9abe7bc8038a679d3763.zip | |
Define and use limit constants for Irrlicht fixed-width types
Diffstat (limited to 'src/mapgen_v7.cpp')
| -rw-r--r-- | src/mapgen_v7.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 92f3f49c4..7ed4bc516 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -181,7 +181,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 +636,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 +673,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 +698,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; } |