diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-18 18:18:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-18 18:18:25 +0200 |
| commit | c42753338924bb29c61081c9f269772f89bcd808 (patch) | |
| tree | 3ccbf49ad802c57a1288ea978268315b68d8e65f /src/mapnode.cpp | |
| parent | fb196be8cf8606cfab144e2fe62d9c9d1f50932f (diff) | |
| download | minetest-c42753338924bb29c61081c9f269772f89bcd808.tar.gz minetest-c42753338924bb29c61081c9f269772f89bcd808.tar.bz2 minetest-c42753338924bb29c61081c9f269772f89bcd808.zip | |
Modernize various files (src/m*) (#6267)
* Modernize various files (src/m*)
* range-based for loops
* code style
* C++ headers instead of C headers
* Default operators
* empty function
Thanks to clang-tidy
Diffstat (limited to 'src/mapnode.cpp')
| -rw-r--r-- | src/mapnode.cpp | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/mapnode.cpp b/src/mapnode.cpp index fd28910ff..b06b42ba8 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -249,18 +249,12 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox, int facedir = n.getFaceDir(nodemgr); u8 axisdir = facedir>>2; facedir&=0x03; - for(std::vector<aabb3f>::const_iterator - i = fixed.begin(); - i != fixed.end(); ++i) - { - aabb3f box = *i; - + for (aabb3f box : fixed) { if (nodebox.type == NODEBOX_LEVELED) { box.MaxEdge.Y = -BS/2 + BS*((float)1/LEVELED_MAX) * n.getLevel(nodemgr); } - switch (axisdir) - { + switch (axisdir) { case 0: if(facedir == 1) { @@ -403,16 +397,15 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox, nodebox.wall_side.MaxEdge }; - for(s32 i=0; i<2; i++) - { + for (v3f &vertice : vertices) { if(dir == v3s16(-1,0,0)) - vertices[i].rotateXZBy(0); + vertice.rotateXZBy(0); if(dir == v3s16(1,0,0)) - vertices[i].rotateXZBy(180); + vertice.rotateXZBy(180); if(dir == v3s16(0,0,-1)) - vertices[i].rotateXZBy(90); + vertice.rotateXZBy(90); if(dir == v3s16(0,0,1)) - vertices[i].rotateXZBy(-90); + vertice.rotateXZBy(-90); } aabb3f box = aabb3f(vertices[0]); @@ -467,7 +460,7 @@ void transformNodeBox(const MapNode &n, const NodeBox &nodebox, } static inline void getNeighborConnectingFace( - v3s16 p, INodeDefManager *nodedef, + const v3s16 &p, INodeDefManager *nodedef, Map *map, MapNode n, u8 bitmask, u8 *neighbors) { MapNode n2 = map->getNodeNoEx(p); @@ -605,14 +598,16 @@ u32 MapNode::serializedLength(u8 version) if(!ser_ver_supported(version)) throw VersionMismatchException("ERROR: MapNode format not supported"); - if(version == 0) + if (version == 0) return 1; - else if(version <= 9) + + if (version <= 9) return 2; - else if(version <= 23) + + if (version <= 23) return 3; - else - return 4; + + return 4; } void MapNode::serialize(u8 *dest, u8 version) { |