fix assets uncompress size

julesgrc0 · Feb 12, 2024 · f243a89 · f243a89
1 parent 33d4722
commit f243a89
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/screen/loading.c b/src/screen/loading.c
@@ -1,8 +1,6 @@
 #include "loading.h"
 
 void load_assets(w_state *state) {
-  printf("Loading assets...\n");
-
   state->render = LoadRenderTexture(RENDER_W, RENDER_H);
   // LoadRenderTexture(state->config->render_size, state->config->render_size);
   state->src_rnd = (Rectangle){0.0f, 0.0f, (float)state->render.texture.width,

diff --git a/src/unpack/unpack.c b/src/unpack/unpack.c
@@ -41,11 +41,26 @@ w_asset *unpack_assets(HINSTANCE hInstance, size_t *size) {
   if (!out_buffer)
     return NULL;
 
-  if (uncompress(out_buffer, (uLongf *)&out_size, in_buffer, (uLong)in_size) !=
-      Z_OK) {
+  size_t try_index = 0;
+  for (try_index; try_index < MAX_UNCOMPRESSE_TRY; try_index++) {
+    if (uncompress(out_buffer, (uLongf *)&out_size, in_buffer,
+                   (uLong)in_size) != Z_OK) {
+      out_size *= 2;
+      void *new_outbuff = realloc(out_buffer, out_size);
+      if (new_outbuff == NULL) {
+        sfree(out_buffer);
+        return NULL;
+      }
+      out_buffer = new_outbuff;
+    } else {
+      break;
+    }
+  }
+  if (try_index >= MAX_UNCOMPRESSE_TRY) {
     sfree(out_buffer);
     return NULL;
   }
+
   void *new_outbuff = realloc(out_buffer, out_size);
   if (new_outbuff == NULL) {
     sfree(out_buffer);

diff --git a/src/unpack/unpack.h b/src/unpack/unpack.h
@@ -2,6 +2,8 @@
 #include "../resource.h"
 #include "../stdafx.h"
 
+#define MAX_UNCOMPRESSE_TRY 4
+
 typedef struct w_asset {
   char *name;