progress

include/keraforge/actor.h

···
 
 /* Save actor data. */
 int kf_saveactors(void);
+/* Load actor data. */
+int kf_loadactors(void);
 
 
 #endif

src/actor.c

···
 #include "keraforge/actor.h"
+#include "keraforge/fs.h"
 #include <keraforge.h>
 #include <stdlib.h>
 #include <raymath.h>
···
 
 	/* kf_actor_count includes unserialized actors, so we have to manually count. */
 	for (struct kf_actor *actor = kf_actors ; actor != NULL ; actor = actor->next)
+	{
+		if (!actor->key)
+			continue;
+		int id = kf_actor_getregistryid(actor->key);
+		if (id == -1)
+			continue;
 		nactors++;
+	}
 	bini_wlu(bs, nactors);
 
 	for (struct kf_actor *actor = kf_actors ; actor != NULL ; actor = actor->next)
···
 			continue;
 		bini_wstr(bs, actor->key);
 		kf_actorregistry.serialize[id](actor, bs);
-		nactors++;
 	}
 
 	kf_logdbg("serialized %d actors (%lu bytes)", nactors, bs->len);
 
 	// char *outfile = compress ? _KF_ACTORFILE_TMP : _KF_ACTORFILE;
 	char *outfile = _KF_ACTORFILE;
-
-	FILE *fp = fopen(outfile, "wb");
-	if (!fp)
-		KF_THROW("failed to open %s", outfile);
-	if (fwrite(bs->buffer, bs->len, 1, fp) != bs->len)
+	if (!kf_writebin(outfile, bs->buffer, bs->len))
 		KF_THROW("failed to write actors to %s", outfile);
-	fclose(fp);
 
 	return 1;
 }
 
-// int kf_loadactors(void)
-// {
-// 	// char *infile = compress ? _KF_ACTORFILE_TMP : _KF_ACTORFILE;
-// 	char *infile = _KF_ACTORFILE;
+int kf_loadactors(void)
+{
+	// char *infile = compress ? _KF_ACTORFILE_TMP : _KF_ACTORFILE;
+	char *infile = _KF_ACTORFILE;
 
-// 	size_t len = 0;
-// 	struct bini_stream bs = {
-// 		.mode = BINI_STREAM,
-// 		.buffer = kf_readbin(infile, &len),
-// 	};
-// 	if (!bs.buffer)
-// 		KF_THROW("failed to read/open %s", infile);
-// 	bs.cap = len;
-// 	bs.len = len;
-// 	kf_logdbg("loaded actors into binary stream: len=%lu", len);
+	size_t len = 0;
+	struct bini_stream bs = {
+		.mode = BINI_STREAM,
+		.buffer = kf_readbin(infile, &len),
+	};
+	if (!bs.buffer)
+		KF_THROW("failed to read/open %s", infile);
+	bs.cap = len;
+	bs.len = len;
+	kf_logdbg("loaded actors into binary stream: len=%lu", len);
 
-// 	const size_t nactors = bini_rlu(&bs);
+	const size_t nactors = bini_rlu(&bs);
 
-// 	for (size_t i = 0 ; i < nactors ; i++)
-// 	{
-// 		char key[4096] = {0};
-// 		bini_rstr(&bs, key);
-// 		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);
-// 	}
+	for (size_t i = 0 ; i < nactors ; i++)
+	{
+		char key[4096] = {0};
+		bini_rstr(&bs, key);
+		int id = kf_actor_getregistryid(key);
+		if (id == -1)
+			continue;
+		struct kf_actor *actor = kf_actor_new(key);
+		kf_actorregistry.deserialize[id](actor, &bs);
+	}
 
-// 	kf_logdbg("loaded %d actors", nactors);
+	kf_logdbg("loaded %d actors", nactors);
 
-// 	free(bs.buffer);
+	free(bs.buffer);
 
-// 	return 1;
-// }
+	return 1;
+}

src/graphics.c

···
 	kf_actorregistry.tick[idplayer] = kf_player_tick;
 	kf_actorregistry.draw[idplayer] = kf_player_draw;
 
-	struct kf_actor *player = kf_actor_new("player");
-	player->size.x = 10;
-	player->size.y = 10;
-	player->collide = true;
-	player->sizeoffset.y = 6;
-	player->controlled = true;
-	if (is_new_state) /* place the player in the centre of the room */
-	{
-		state->player.pos.x = world->width * KF_TILE_SIZE_PX / 2.0f;
-		state->player.pos.y = world->width * KF_TILE_SIZE_PX / 2.0f;
-	}
-	player->pos.x = state->player.pos.x;
-	player->pos.y = state->player.pos.y;
-	kf_window.player = player;
-
 	int idplayer2 = kf_actor_register("player2");
 	kf_actorregistry.serialize[idplayer2] = kf_player_serialize;
 	kf_actorregistry.deserialize[idplayer2] = kf_player_deserialize;
 	kf_actorregistry.sprite[idplayer2] = kf_actor_loadspritesheet("data/res/img/char/whom.png");
 	kf_actorregistry.tick[idplayer2] = kf_player_tick;
 	kf_actorregistry.draw[idplayer2] = kf_player_draw;
+
+	if (is_new_state)
+	{
+		struct kf_actor *player = kf_actors; /* player should always be the first actor. */
+
+		state->player.pos.x = world->width * KF_TILE_SIZE_PX / 2.0f;
+		state->player.pos.y = world->width * KF_TILE_SIZE_PX / 2.0f;
+
+		kf_timeit("save actors", kf_saveactors());
+	}
+	else
+	{
+		kf_timeit("load actors", kf_loadactors());
+	}
+
+	struct kf_actor *player = kf_actors; /* player should always be the first actor. */
+	kf_window.player = player;
 
 	struct kf_actor *player2 = kf_actor_new("player2");
 	player2->size.x = 10;

src/player.c

···
 {
 	bini_wf(bs, self->pos.x);
 	bini_wf(bs, self->pos.y);
+	bini_wb(bs, self->controlled);
 }
 
 void kf_player_deserialize(struct kf_actor *self, struct bini_stream *bs)