buffer flush (wip)

1 files changed, 24 insertions, 7 deletions

diff --git a/src/character.hpp b/src/character.hpp
index 9e2617ae..9481c4ac 100644
--- a/src/character.hpp
+++ b/src/character.hpp
@@ -2,32 +2,49 @@
 #include "src/global-coords.hpp"
 #include "src/rotation.hpp"
 #include "src/entity.hpp"
-#include <memory>
+#include <Corrade/Containers/String.h>
 
 namespace floormat {
 
 struct anim_atlas;
 struct world;
 
+struct character_proto : entity_proto
+{
+    String name;
+    bool playable : 1 = false;
+
+    character_proto();
+    character_proto(const character_proto&);
+    ~character_proto() noexcept override;
+    character_proto& operator=(const character_proto&);
+    bool operator==(const entity_proto& proto) const override;
+    operator bool() const;
+};
+
 struct character final : entity
 {
     ~character() override;
+    explicit operator character_proto() const;
+
     void set_keys(bool L, bool R, bool U, bool D);
     bool update(std::size_t i, float dt) override;
-    bool is_playable() const { return playable; }
+    void update_bbox(Vector2b bbox_offset, Vector2ub bbox_size) override;
+
+    String name;
+    Vector2s offset_frac;
+    bool b_L : 1 = false, b_R : 1 = false, b_U : 1 = false, b_D : 1 = false;
+    bool playable : 1 = false;
 
 private:
     int allocate_frame_time(float dt);
     static Vector2 move_vec(int left_right, int top_bottom);
 
     friend struct world;
-    character(std::uint64_t id, struct chunk& c, entity_type type, bool playable);
-
-    Vector2s offset_frac;
-    bool b_L : 1 = false, b_R : 1 = false, b_U : 1 = false, b_D : 1 = false;
-    bool playable : 1 = false;
+    character(std::uint64_t id, struct chunk& c, entity_type type, const character_proto& proto);
 };
 
 template<> struct entity_type_<struct character> : std::integral_constant<entity_type, entity_type::character> {};
+template<> struct entity_type_<struct character_proto> : std::integral_constant<entity_type, entity_type::character> {};
 
 } // namespace floormat