X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fvoxel.h;h=d03cecd95e8454eb29e2e19b5c2fc3d1f7871a66;hb=115f52af862bc5bf1cb47fe2cc6e0eadb85915a6;hp=49a75c95f6f53aedc21ea22cc2bab6c86be28392;hpb=fd3afbced5410639325e730d5710b8b5039b320e;p=dragonfireclient.git diff --git a/src/voxel.h b/src/voxel.h index 49a75c95f..d03cecd95 100644 --- a/src/voxel.h +++ b/src/voxel.h @@ -59,7 +59,7 @@ class VoxelArea { public: // Starts as zero sized - VoxelArea() {} + VoxelArea() = default; VoxelArea(const v3s16 &min_edge, const v3s16 &max_edge): MinEdge(min_edge), @@ -175,12 +175,12 @@ class VoxelArea VoxelArea operator+(const v3s16 &off) const { - return VoxelArea(MinEdge+off, MaxEdge+off); + return {MinEdge+off, MaxEdge+off}; } VoxelArea operator-(const v3s16 &off) const { - return VoxelArea(MinEdge-off, MaxEdge-off); + return {MinEdge-off, MaxEdge-off}; } /* @@ -344,7 +344,7 @@ enum VoxelPrintMode class VoxelManipulator { public: - VoxelManipulator(); + VoxelManipulator() = default; virtual ~VoxelManipulator(); /* @@ -374,7 +374,7 @@ class VoxelManipulator addArea(voxel_area); if (m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA) { - return MapNode(CONTENT_IGNORE); + return {CONTENT_IGNORE}; } return m_data[m_area.index(p)]; @@ -382,9 +382,9 @@ class VoxelManipulator MapNode getNodeNoExNoEmerge(const v3s16 &p) { if (!m_area.contains(p)) - return MapNode(CONTENT_IGNORE); + return {CONTENT_IGNORE}; if (m_flags[m_area.index(p)] & VOXELFLAG_NO_DATA) - return MapNode(CONTENT_IGNORE); + return {CONTENT_IGNORE}; return m_data[m_area.index(p)]; } // Stuff explodes if non-emerged area is touched with this.