diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-08-16 08:26:04 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-08-16 08:26:04 +0200 |
| commit | 90dfafcda2d4bc33356983c7145bf10202c26bbd (patch) | |
| tree | 8a3e97d11f3b4f1dee9b181215e7624f8c2e3eac /src/cavegen.cpp | |
| parent | 9dd0f952e09471f15f59a98c1ae650d99499cd77 (diff) | |
| download | minetest-90dfafcda2d4bc33356983c7145bf10202c26bbd.tar.xz | |
cavegen.cpp, chat.cpp: modernize code
Diffstat (limited to 'src/cavegen.cpp')
| -rw-r--r-- | src/cavegen.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cavegen.cpp b/src/cavegen.cpp index fc9526b4f..0a950ecf4 100644 --- a/src/cavegen.cpp +++ b/src/cavegen.cpp @@ -515,7 +515,7 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz) v3s16 p(cp.X + x0, cp.Y + y0, cp.Z + z0); p += of; - if (vm->m_area.contains(p) == false) + if (!vm->m_area.contains(p)) continue; u32 i = vm->m_area.index(p); @@ -819,7 +819,7 @@ void CavesV6::carveRoute(v3f vec, float f, bool randomize_xz, v3s16 p(cp.X + x0, cp.Y + y0, cp.Z + z0); p += of; - if (vm->m_area.contains(p) == false) + if (!vm->m_area.contains(p)) continue; u32 i = vm->m_area.index(p); @@ -858,7 +858,8 @@ inline s16 CavesV6::getSurfaceFromHeightmap(v3s16 p) p.X >= node_min.X && p.X <= node_max.X) { u32 index = (p.Z - node_min.Z) * ystride + (p.X - node_min.X); return heightmap[index]; - } else { - return water_level; } + + return water_level; + } |