engine/engine_conf.h

@@ -22,6 +22,6 @@
 
 #define MAX_TILE_TYPES 16
 #define N_TAGS 10
-#define N_COMPONENTS 16
+#define N_COMPONENTS 20
 #define MAX_COMP_POOL_SIZE MAX_ENTITIES
 #endif // _ENGINE_CONF_H

main.c

@@ -33,8 +33,8 @@ int main(void)
     load_from_infofile("res/assets.info.raw", &engine.assets);
     init_player_creation("res/player_spr.info", &engine.assets);
 #else
-    load_from_rres("res/assets.rres", &engine.assets);
-    init_player_creation_rres("res/assets.rres", "player_spr.info", &engine.assets);
+    load_from_rres("res/myresources.rres", &engine.assets);
+    init_player_creation_rres("res/myresources.rres", "player_spr.info", &engine.assets);
 #endif
     init_item_creation(&engine.assets);
 

res/level_render.py

@@ -254,4 +254,4 @@ for l, level in enumerate(all_levels):
 
 lvl_render = Image.alpha_composite(lvl_render, water_render)
 lvl_render.save("preview.png")
-#lvl_render.show()
+lvl_render.show()

res/pack_resources.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sed 's|res/||g' $1 > assets.info
+sed 's|res/||g' assets.info.raw > assets.info
 ./rres_packer
-mv ../web/res/assets.rres ../web/res/assets.rres.old
-cp ./assets.rres ../web/res/
+mv ../web/res/myresources.rres ../web/res/myresources.rres.old
+cp ./myresources.rres ../web/res/

res/rres_packer.c

@@ -236,7 +236,7 @@ typedef enum AssetInfoType
 
 int main(void)
 {
-    FILE *rresFile = fopen("assets.rres", "wb");
+    FILE *rresFile = fopen("myresources.rres", "wb");
 
     // Define rres file header
     // NOTE: We are loading 4 files that generate 5 resource chunks to save in rres

scene_test.c

@@ -46,11 +46,11 @@ int main(void)
     SetTargetFPS(60);
 
 #ifndef NDEBUG
-    load_from_infofile("res/editor_assets.info.raw", &engine.assets);
+    load_from_infofile("res/assets.info.raw", &engine.assets);
     init_player_creation("res/player_spr.info", &engine.assets);
 #else
-    load_from_rres("res/assets.rres", &engine.assets);
-    init_player_creation_rres("res/assets.rres", "player_spr.info", &engine.assets);
+    load_from_rres("res/myresources.rres", &engine.assets);
+    init_player_creation_rres("res/myresources.rres", "player_spr.info", &engine.assets);
 #endif
     init_item_creation(&engine.assets);
 
@@ -85,6 +85,7 @@ int main(void)
         emscripten_set_keydown_callback("#canvas", NULL, 1, keyDownCallback);
         emscripten_set_main_loop(update_loop, 0, 1);
     #else
+        puts("Regular main loop");
         const float DT = 1.0f/60.0f;
         while(true)
         {

scenes/editor_scene.c

@@ -58,9 +58,9 @@ static Vector2 urchin_click_pos = {0,0};
 #define SELECTION_LAYER 0
 #define CONTROL_LAYER 1
 
-#define N_SOLID_TILESETS 4
+#define N_SOLID_TILESETS 3
 static const char* SOLID_TILE_SELECTIONS[N_SOLID_TILESETS] = {
-    "stile0", "stile1", "stile2", "stile3"
+    "stile0", "stile1", "stile2"
 };
 
 static char* get_spawn_selection_string(enum EntitySpawnSelection sel)

scenes/engine_impl.c

@@ -12,10 +12,10 @@ DEFINE_COMP_MEMPOOL_BUF(CHurtbox_t, MAX_COMP_POOL_SIZE)
 DEFINE_COMP_MEMPOOL_BUF(CSprite_t, MAX_COMP_POOL_SIZE)
 DEFINE_COMP_MEMPOOL_BUF(CMoveable_t, MAX_COMP_POOL_SIZE)
 DEFINE_COMP_MEMPOOL_BUF(CLifeTimer_t, MAX_COMP_POOL_SIZE)
-DEFINE_COMP_MEMPOOL_BUF(CWaterRunner_t, 16)
+DEFINE_COMP_MEMPOOL_BUF(CWaterRunner_t, 32)
 DEFINE_COMP_MEMPOOL_BUF(CAirTimer_t, 8)
 DEFINE_COMP_MEMPOOL_BUF(CEmitter_t, 32)
-DEFINE_COMP_MEMPOOL_BUF(CSquishable_t, 255)
+DEFINE_COMP_MEMPOOL_BUF(CSquishable_t, MAX_COMP_POOL_SIZE)
 
 // Component mempools are added in the order of the component enums
 BEGIN_DEFINE_COMP_MEMPOOL