summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-21 14:20:16 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-21 14:20:16 +0200
commit7a38c6c434e03256d9e9fbff87516b3ad1e3958a (patch)
tree2cb34a9613fc7f50a6bd7dc0d03eca448e3f5567 /src
parent9a0d8a428b21a77272380009d97436b0a5f20d8c (diff)
macro shenanigans
Diffstat (limited to 'src')
-rw-r--r--src/chunk.hpp2
-rw-r--r--src/tile.hpp2
-rw-r--r--src/world.hpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/chunk.hpp b/src/chunk.hpp
index 9e41c5fb..5e4f5392 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -37,7 +37,7 @@ struct chunk final
chunk() = default;
chunk(chunk&&) = default;
chunk& operator=(chunk&&) = default;
- DECLARE_DELETED_COPY_ASSIGNMENT(chunk);
+ fm_DECLARE_DELETED_COPY_ASSIGNMENT(chunk);
private:
std::array<tile, TILE_COUNT> _tiles = {};
diff --git a/src/tile.hpp b/src/tile.hpp
index a58d129a..067df3c7 100644
--- a/src/tile.hpp
+++ b/src/tile.hpp
@@ -28,7 +28,7 @@ struct tile final
constexpr tile() = default;
tile(tile&&) = default;
- DECLARE_DEPRECATED_COPY_ASSIGNMENT(tile);
+ fm_DECLARE_DEPRECATED_COPY_ASSIGNMENT(tile);
};
} //namespace floormat
diff --git a/src/world.hpp b/src/world.hpp
index 7c256efc..89bc4feb 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -19,6 +19,8 @@ struct world final
void clear();
void collect();
+ fm_DECLARE_DELETED_COPY_ASSIGNMENT(world);
+
private:
void maybe_collect();