try to cleanly destruct world

[blank.git] / src / world / BlockType.hpp

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index 1ea34a1f897558e28e5020dc4545eb19513b55a5..b50169c53ee72ac033e5c1eac09b1eabd551a9cd 100644 (file)
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -4,7 +4,7 @@
 #include "Block.hpp"
 #include "../graphics/BlockMesh.hpp"
 #include "../graphics/EntityMesh.hpp"
-#include "../graphics/OutlineMesh.hpp"
+#include "../graphics/PrimitiveMesh.hpp"
 #include "../model/Shape.hpp"
 
 #include <glm/glm.hpp>
@@ -26,6 +26,9 @@ struct BlockType {
        /// a string to display to the user
        std::string label;
 
+       int place_sound;
+       int remove_sound;
+
        Block::Type id;
 
        /// light level that blocks of this type emit
@@ -76,7 +79,7 @@ struct BlockType {
                const glm::mat4 &transform = glm::mat4(1.0f),
                BlockMesh::Index idx_offset = 0
        ) const noexcept;
-       void FillOutlineMesh(OutlineMesh::Buffer &m) const noexcept;
+       void OutlinePrimitiveMesh(PrimitiveMesh::Buffer &) const noexcept;
 
 };