(temp) more progress

include/keraforge/actor.h

···
 struct kf_actorregistry
 {
 	int count;
-	char *id[KF_MAX_ACTOR_TYPES];
+	char *key[KF_MAX_ACTOR_TYPES];
+	/* Save the actor to a binary stream. */
 	void (*serialize[KF_MAX_ACTOR_TYPES])(struct kf_actor *self, struct bini_stream *bs);
+	/* Load the actor from a binary stream. */
 	void (*deserialize[KF_MAX_ACTOR_TYPES])(struct kf_actor *self, struct bini_stream *bs);
+	/* Called every frame to update the actor. Don't forget about deltatime (kf_dts, kf_dtms)! */
+	void (*tick[KF_MAX_ACTOR_TYPES])(struct kf_actor *self);
+	/* Called every frame to render the actor. */
+	void (*draw[KF_MAX_ACTOR_TYPES])(struct kf_actor *self);
+	/* Spritesheet for the actor. */
+	struct kf_spritesheet sprite[KF_MAX_ACTOR_TYPES];
 };
 /* Global actor registry instance. */
 extern struct kf_actorregistry kf_actorregistry;
···
 struct kf_actor
 {
 	/* Unique string identifier for this actor. */
-	char *id;
-	/* Spritesheet for the actor. */
-	struct kf_spritesheet sprites;
+	char *key;
+	/* Unique integer identifier for this actor, comes from kf_actorregistry. */
+	int id;
 	/* The actor's position. */
 	struct kf_vec2(f32) pos;
 	/* The actor's velocity. */
···
 	enum kf_direction pointing;
 	/* If the actor is running. This will not increase their speed, you are expected to yourself. */
 	bool running;
-	/* Called every frame to update the actor. Don't forget about deltatime (kf_dts, kf_dtms)! */
-	void (*tick)(struct kf_actor *self);
-	/* Called every frame to render the actor. */
-	void (*draw)(struct kf_actor *self);
 	/* Doubly-linked list of actors. */
 	struct kf_actor *prev, *next;
 };
···
 
 
 /* Create a new actor. */
-struct kf_actor *kf_actor_new(char *id, struct kf_spritesheet sprites, f32 width, f32 height, bool collides);
+struct kf_actor *kf_actor_new(char *key);
 
 /* Load a spritesheet, filling in the details for loading character spritesheets. */
 struct kf_spritesheet kf_actor_loadspritesheet(char *filename);
···
 
 /* Get the registry ID of a given actor ID.
    This will perform a lot of string comparisons, use sparingly! */
-int kf_actor_getregistryid(char *id);
+int kf_actor_getregistryid(char *key);
 
 /* Save actor data. */
 int kf_saveactors(void);

include/keraforge/player.h

···
 void kf_player_tick(struct kf_actor *self);
 void kf_player_draw(struct kf_actor *self);
 
-u8* kf_player_serialize(struct kf_actor *self, size_t *plen);
-void kf_player_deserialize(struct kf_actor *self, u8 *data, size_t len);
+void kf_player_serialize(struct kf_actor *self, struct bini_stream *bs);
+void kf_player_deserialize(struct kf_actor *self, struct bini_stream *bs);
 
 #endif

src/actor.c

···
-#include "keraforge/bini.h"
+#include "keraforge/actor.h"
 #include <keraforge.h>
 #include <stdlib.h>
 #include <raymath.h>
···
 u32 kf_actor_count = 0;
 
 
-struct kf_actor *kf_actor_new(char *id, struct kf_spritesheet sprites, f32 width, f32 height, bool collides)
+struct kf_actor *kf_actor_new(char *key)
 {
 	struct kf_actor *actor = calloc(1, sizeof(struct kf_actor));
 	kf_actor_count++;
···
 		kf_actors_last = actor;
 	}
 
-	actor->id = id;
-	actor->sprites = sprites;
-	actor->size.x = width;
-	actor->size.y = height;
-	actor->collide = collides;
+	actor->id = kf_actor_getregistryid(key);
+	actor->key = key;
+	actor->size.x = 10;
+	actor->size.y = 10;
+	actor->collide = true;
 
 	actor->speed = 25;
 	actor->speedmod = 1;
···
 
 	x += (int)(kf_s * (frames+1)) % frames;
 
-	kf_drawsprite(&actor->sprites, actor->pos.x, actor->pos.y, x, y);
+	kf_drawsprite(&kf_actorregistry.sprite[actor->id], actor->pos.x, actor->pos.y, x, y);
 }
 
-int kf_actor_getregistryid(char *id)
+int kf_actor_getregistryid(char *key)
 {
-	size_t l = strlen(id);
+	size_t l = strlen(key);
 	for (int i = 0 ; i < kf_actorregistry.count ; i++)
 	{
-		char *c = kf_actorregistry.id[i];
+		char *c = kf_actorregistry.key[i];
 		size_t cl = strlen(c);
-		if (strncmp(c, id, l>cl?l:cl) == 0)
+		if (strncmp(c, key, l>cl?l:cl) == 0)
 		{
 			return i;
 		}
···
 
 	for (struct kf_actor *actor = kf_actors ; actor != NULL ; actor = actor->next)
 	{
-		if (!actor->id)
+		if (!actor->key)
 			continue;
-		int id = kf_actor_getregistryid(actor->id);
+		int id = kf_actor_getregistryid(actor->key);
 		if (id == -1)
 			continue;
-		bini_wstr(bs, actor->id);
+		bini_wstr(bs, actor->key);
 		kf_actorregistry.serialize[id](actor, bs);
 		nactors++;
 	}
···
 		int id = kf_actor_getregistryid(key);
 		if (id == -1)
 			continue;
+		struct kf_actor *actor = kf_actor_new(key, k, f32 width, f32 height, bool collides)
 		kf_actorregistry.deserialize[id](actor, &bs);
-		nactors++;
 	}
 
 	kf_logdbg("loaded %d actors", nactors);

src/player.c

···
+#include "keraforge/bini.h"
 #include <keraforge.h>
 
 
···
 	}
 }
 
-
-struct _kf_serialized_player
+void kf_player_serialize(struct kf_actor *self, struct bini_stream *bs)
 {
-	struct kf_vec2(f32) pos;
-};
-
-u8* kf_player_serialize(struct kf_actor *self, size_t *plen)
-{
-	*plen = sizeof(struct _kf_serialized_player);
-	struct _kf_serialized_player *s = malloc(*plen);
-	s->pos = self->pos;
-	return (u8 *)s;
+	bini_wf(bs, self->pos.x);
+	bini_wf(bs, self->pos.y);
 }
 
-void kf_player_deserialize(struct kf_actor *self, u8 *data, size_t len)
+void kf_player_deserialize(struct kf_actor *self, struct bini_stream *bs)
 {
-	(void)len;
-	struct _kf_serialized_player *s = (struct _kf_serialized_player *)data;
-	self->pos = s->pos;
+	self->pos.x = bini_rf(bs);
+	self->pos.y = bini_rf(bs);
 }