Apply texture prefix in replacer

Also, fixed the last warning.

alr/src/alr.c

@@ -202,7 +202,7 @@ bool alr_parse(char* alr_filename, flags options, alr_interface handlers) {
     }
     resource_entry* entries = (resource_entry*)(res_chunk_buf + sizeof(u32));
 
-    fseek(alr, sizeof(u32) * -1, SEEK_CUR);
+    fseek(alr, -1 * (signed long)sizeof(u32), SEEK_CUR);
     long pos = ftell(alr);
     fread(res_chunk_buf, (sizeof(*entries) * res_header.array_size) + sizeof(u32), 1, alr);
 

alr/src/replace.c

@@ -17,16 +17,27 @@ u32 u32_min(u32 x, u32 y) {
     return y;
 }
 
-void replace_texture(u8* buf, u32 size, u32 idx) {
-    char path[256] = {0};
-    snprintf(path, sizeof(path), "textures/%d.dds", idx);
-    if (file_exists(path)) {
-        u32 tex_size = filesize(path);
+void replace_texture(void* ctx, u8* buf, u32 size, u32 idx) {
+    char* path = (char*) ctx;
+    u32 dot_idx;
+    for (u32 i = strlen(path); i > 0; i--) {
+        if (path[i] == '.') {
+            dot_idx = i;
+        }
+    }
+    path[dot_idx] = 0x00;
+    char filename[256] = {0};
+    sprintf(filename, "textures/%s_%d.dds", path, idx);
+    path[dot_idx] = '.';
+
+    // Make the directory if it doesn't exist.
+    if (file_exists(filename)) {
+        u32 tex_size = filesize(filename);
 
         // Load the mod texture data
-        u8* mod_dds = file_load(path);
+        u8* mod_dds = file_load(filename);
         if (mod_dds == NULL) {
-            LOG_MSG(error, "Failed to load %d bytes from %s\n", tex_size, path);
+            LOG_MSG(error, "Failed to load %d bytes from %s\n", tex_size, filename);
         }
         else {
             // Raw buffer without DDS header
@@ -41,7 +52,7 @@ void replace_texture(u8* buf, u32 size, u32 idx) {
         }
     }
     else {
-        LOG_MSG(info, "%s not found, skipping\n", path);
+        LOG_MSG(info, "%s not found, skipping\n", filename);
     }
 }
 

alr/src/replace.h

@@ -4,11 +4,11 @@
 // Stub to fill out the interface
 // TODO: Allow NULL interface functions and replace them with a stub in the alr
 // functions at runtime. Will make the declarations much simpler and clearer.
-static void replace_chunk(chunk_generic chunk, u8* chunk_buf, u32 idx) {
+static void replace_chunk(void* ctx, chunk_generic chunk, u8* chunk_buf, u32 idx) {
     return;
 }
 
-void replace_texture(u8* buf, u32 size, u32 idx);
+void replace_texture(void* ctx, u8* buf, u32 size, u32 idx);
 
 // Interface to call parse_alr() with to trigger texture replacement
 const alr_interface replace_interface = {

alr/src/split.c

@@ -5,7 +5,7 @@
 #include "logging.h"
 #include "alr.h"
 
-void split_generic_chunk(chunk_generic chunk, u8* chunk_buf, u32 idx) {
+void split_generic_chunk(void* ctx, chunk_generic chunk, u8* chunk_buf, u32 idx) {
     if (!dir_exists("resources")) {
         system("mkdir resources");
     }
@@ -25,7 +25,7 @@ void split_generic_chunk(chunk_generic chunk, u8* chunk_buf, u32 idx) {
     fclose(dump);
 }
 
-void split_resource(u8* buf, u32 size, u32 idx) {
+void split_resource(void* ctx, u8* buf, u32 size, u32 idx) {
     if (!dir_exists("resources")) {
         system("mkdir resources");
     }

alr/src/split.h

@@ -3,11 +3,11 @@
 
 // Write chunks to separate files based on their index in the header's offset
 // array.
-void split_generic_chunk(chunk_generic chunk, u8* chunk_buf, u32 idx);
+void split_generic_chunk(void* ctx, chunk_generic chunk, u8* chunk_buf, u32 idx);
 
 // Write each texture buffer to its own file. Useful for pasting into image
 // preview tools, and hand-crafting your own image headers.
-void split_resource(u8* buf, u32 size, u32 idx);
+void split_resource(void* ctx, u8* buf, u32 size, u32 idx);
 
 // Interface to call parse_alr() with to trigger splitting behaviour.
 alr_interface split_interface = {