merge and particule system start

include/components/attack_component.h

@@ -21,6 +21,7 @@ typedef struct attack_holder {
 struct attack_component {
     gc_component base;
     attack_holder *attacks;
+    char *name;
 };
 
 extern const struct attack_component attack_component;

include/components/combat_holder.h

@@ -14,7 +14,6 @@
 struct combat_holder
 {
     gc_component base;
-    char *name;
 };
 
 extern const struct combat_holder combat_holder;

include/components/dialog_holder.h

@@ -29,6 +29,7 @@ struct dialog_holder {
     bool single_usage;
     bool has_seen;
     struct tile *tile;
+    void (*close_callback)(gc_engine *engine);
 };
 
 const struct dialog_holder dialog_holder;