Switch to filename, not id lookups, fix sprite load bug

Vagabond · Vagabond · commit b401e12d457b · 2025-09-23T11:35:51.000-07:00
diff --git a/src/resources/af.c b/src/resources/af.c
@@ -4,7 +4,7 @@
 #include "resources/sprite.h"
 #include <string.h>
 
-void af_create(af *a, void *src) {
+void af_create(af *a, void *src, str *name) {
     sd_af_file *sdaf = (sd_af_file *)src;
 
     // Trivial stuff
@@ -32,12 +32,12 @@ void af_create(af *a, void *src) {
     for(int i = 0; i < 70; i++) {
         if(sdaf->moves[i] != NULL) {
             af_move *move = omf_calloc(1, sizeof(af_move));
-            af_move_create(a->id, move, &a->sprites, (void *)sdaf->moves[i], i);
+            af_move_create(name, move, &a->sprites, (void *)sdaf->moves[i], i);
             array_set(&a->moves, i, move);
         }
     }
 
-    modmanager_get_fighter_header(a->id, a);
+    modmanager_get_fighter_header(name, a);
 }
 
 af_move *af_get_move(const af *a, int id) {
diff --git a/src/resources/af.h b/src/resources/af.h
@@ -18,7 +18,7 @@ typedef struct af_t {
     char sound_translation_table[30];
 } af;
 
-void af_create(af *a, void *src);
+void af_create(af *a, void *src, str *name);
 af_move *af_get_move(const af *a, int id);
 void af_free(af *a);
 
diff --git a/src/resources/af_loader.c b/src/resources/af_loader.c
@@ -9,6 +9,9 @@ int load_af_file(af *a, int id) {
     // Get directory + filename
     const path filename = get_resource_filename(get_resource_file(id));
 
+    str fn;
+    path_stem(&filename, &fn);
+
     // Load up AF file from libSD
     sd_af_file tmp;
     if(sd_af_create(&tmp) != SD_SUCCESS) {
@@ -20,7 +23,7 @@ int load_af_file(af *a, int id) {
     }
 
     // Convert
-    af_create(a, &tmp);
+    af_create(a, &tmp, &fn);
     sd_af_free(&tmp);
     return 0;
 }
diff --git a/src/resources/af_move.c b/src/resources/af_move.c
@@ -2,7 +2,7 @@
 #include "formats/move.h"
 #include "resources/modmanager.h"
 
-void af_move_create(int file_id, af_move *move, array *sprites, void *src, int id) {
+void af_move_create(str *name, af_move *move, array *sprites, void *src, int id) {
     sd_move *sdmv = (sd_move *)src;
     str_from_c(&move->move_string, sdmv->move_string);
     str_from_c(&move->footer_string, sdmv->footer_string);
@@ -18,8 +18,8 @@ void af_move_create(int file_id, af_move *move, array *sprites, void *src, int i
     move->pos_constraints = sdmv->pos_constraint;
     move->throw_duration = sdmv->throw_duration;
     move->extra_string_selector = sdmv->extra_string_selector;
-    animation_create(AF_ANIMATION, file_id, &move->ani, sprites, sdmv->animation, id);
-    modmanager_get_af_move(file_id, id, move);
+    animation_create(AF_ANIMATION, name, &move->ani, sprites, sdmv->animation, id);
+    modmanager_get_af_move(name, id, move);
     if(id == ANIM_JUMPING) {
         // fixup the jump coordinates
         animation_fixup_coordinates(&move->ani, 0, JUMP_COORD_ADJUSTMENT * -1);
diff --git a/src/resources/af_move.h b/src/resources/af_move.h
@@ -28,7 +28,7 @@ typedef struct af_move_t {
 #endif
 } af_move;
 
-void af_move_create(int file_id, af_move *move, array *sprites, void *src, int id);
+void af_move_create(str *name, af_move *move, array *sprites, void *src, int id);
 void af_move_free(af_move *move);
 
 #endif // AF_MOVE_H
diff --git a/src/resources/animation.c b/src/resources/animation.c
@@ -8,7 +8,7 @@ typedef struct sprite_reference_t {
     sprite *sprite;
 } sprite_reference;
 
-void animation_create(animation_source type, int file_id, animation *ani, array *sprites, void *src, int id) {
+void animation_create(animation_source type, str *name, animation *ani, array *sprites, void *src, int id) {
     sd_animation *sdani = (sd_animation *)src;
 
     // Copy simple stuff
@@ -52,7 +52,7 @@ void animation_create(animation_source type, int file_id, animation *ani, array
             tmp_sprite = omf_calloc(1, sizeof(sprite));
             sd_sprite *sp;
             // TODO check the mod overrides for a replacement sprite
-            if(modmanager_get_sprite(type, file_id, ani->id, i, &sp)) {
+            if(modmanager_get_sprite(type, name, ani->id, i, &sp)) {
                 sprite_create(tmp_sprite, (void *)sp, i);
                 tmp_sprite->data->render_w = sdani->sprites[i]->width;
                 tmp_sprite->data->render_h = sdani->sprites[i]->height;
diff --git a/src/resources/animation.h b/src/resources/animation.h
@@ -52,7 +52,7 @@ typedef struct animation_t {
     vector sprites;
 } animation;
 
-void animation_create(animation_source type, int file_id, animation *ani, array *sprites, void *src, int id);
+void animation_create(animation_source type, str *name, animation *ani, array *sprites, void *src, int id);
 sprite *animation_get_sprite(animation *ani, int sprite_id);
 void animation_free(animation *ani);
 
diff --git a/src/resources/bk.c b/src/resources/bk.c
@@ -5,15 +5,15 @@
 #include "utils/log.h"
 #include <string.h>
 
-void bk_create(bk *b, void *src) {
+void bk_create(bk *b, void *src, str *name) {
     sd_bk_file *sdbk = (sd_bk_file *)src;
 
     // File ID
     b->file_id = sdbk->file_id;
 
     // Copy VGA image
     sd_vga_image *img;
-    if(modmanager_get_bk_background(b->file_id, &img)) {
+    if(modmanager_get_bk_background(name, &img)) {
         log_info("using modified BK background");
         surface_create_from_vga(&b->background, img);
         b->background.render_w = 320;
@@ -41,7 +41,7 @@ void bk_create(bk *b, void *src) {
     bk_info tmp_bk_info;
     for(int i = 0; i < 50; i++) {
         if(sdbk->anims[i] != NULL) {
-            bk_info_create(b->file_id, &tmp_bk_info, &b->sprites, (void *)sdbk->anims[i], i);
+            bk_info_create(name, &tmp_bk_info, &b->sprites, (void *)sdbk->anims[i], i);
             hashmap_put_int(&b->infos, i, &tmp_bk_info, sizeof(bk_info));
         }
     }
diff --git a/src/resources/bk.h b/src/resources/bk.h
@@ -16,7 +16,7 @@ typedef struct bk_t {
     char sound_translation_table[30];
 } bk;
 
-void bk_create(bk *b, void *src);
+void bk_create(bk *b, void *src, str *name);
 bk_info *bk_get_info(bk *b, int id);
 vga_palette *bk_get_palette(bk *b, int id);
 vga_remap_tables *bk_get_remaps(bk *b, int id);
diff --git a/src/resources/bk_info.c b/src/resources/bk_info.c
@@ -2,17 +2,16 @@
 #include "formats/bkanim.h"
 #include "resources/modmanager.h"
 
-void bk_info_create(int file_id, bk_info *info, array *sprites, void *src, int id) {
+void bk_info_create(str *name, bk_info *info, array *sprites, void *src, int id) {
     sd_bk_anim *sdinfo = (sd_bk_anim *)src;
-    animation_create(BK_ANIMATION, file_id, &info->ani, sprites, sdinfo->animation, id);
-    // TODO check for mod data here
+    animation_create(BK_ANIMATION, name, &info->ani, sprites, sdinfo->animation, id);
     info->chain_hit = sdinfo->chain_hit;
     info->chain_no_hit = sdinfo->chain_no_hit;
     info->load_on_start = sdinfo->load_on_start;
     info->probability = sdinfo->probability;
     info->hazard_damage = sdinfo->hazard_damage;
     str_from_c(&info->footer_string, sdinfo->footer_string);
-    modmanager_get_bk_animation(file_id, id, info);
+    modmanager_get_bk_animation(name, id, info);
 }
 
 void bk_info_free(bk_info *info) {
diff --git a/src/resources/bk_info.h b/src/resources/bk_info.h
@@ -13,7 +13,7 @@ typedef struct bk_info_t {
     animation ani;
 } bk_info;
 
-void bk_info_create(int file_id, bk_info *info, array *sprites, void *src, int id);
+void bk_info_create(str *name, bk_info *info, array *sprites, void *src, int id);
 void bk_info_free(bk_info *info);
 
 #endif // BK_INFO_H
diff --git a/src/resources/bk_loader.c b/src/resources/bk_loader.c
@@ -13,8 +13,11 @@ int load_bk_file(bk *b, const path *filename) {
         return 1;
     }
 
+    str fn;
+    path_stem(filename, &fn);
+
     // Convert
-    bk_create(b, &tmp);
+    bk_create(b, &tmp, &fn);
     sd_bk_free(&tmp);
     return 0;
 }
diff --git a/src/resources/modmanager.c b/src/resources/modmanager.c
@@ -58,6 +58,8 @@ bool modmanager_init(void) {
         ssize_t entries = zip_entries_total(zip);
         if(entries > 0) {
             // TODO check the mod has a manifest
+            // and then insert it into a secondary list in 'load order'
+            // TODO also check a configured list of enabled/disabled mods, with an ordering
             log_info("mod %s has %d files", path_c(p), entries);
             for(size_t i = 0; i < (size_t)entries; i++) {
                 if(zip_entry_openbyindex(zip, i) == 0 && zip_entry_isdir(zip) == 0) {
@@ -152,27 +154,11 @@ bool modmanager_init(void) {
     return true;
 }
 
-bool modmanager_get_bk_background(int file_id, sd_vga_image **img) {
+bool modmanager_get_bk_background(str *name, sd_vga_image **img) {
     str filename;
-    switch(file_id) {
-        case 8:
-            str_from_c(&filename, "scenes/arena0/background.png");
-            break;
-        case 16:
-            str_from_c(&filename, "scenes/arena1/background.png");
-            break;
-        case 32:
-            str_from_c(&filename, "scenes/arena2/background.png");
-            break;
-        case 64:
-            str_from_c(&filename, "scenes/arena3/background.png");
-            break;
-        case 128:
-            str_from_c(&filename, "scenes/arena4/background.png");
-            break;
-        default:
-            return false;
-    }
+    str_from_format(&filename, "scenes/%s/background.png", str_c(name));
+
+    str_tolower(&filename);
 
     unsigned int len;
     if(!hashmap_get_str(&mod_resources, str_c(&filename), (void **)img, &len)) {
@@ -182,42 +168,27 @@ bool modmanager_get_bk_background(int file_id, sd_vga_image **img) {
     return false;
 }
 
-bool modmanager_get_sprite(animation_source source, int file_id, int animation, int frame, sd_sprite **spr) {
+bool modmanager_get_sprite(animation_source source, str *name, int animation, int frame, sd_sprite **spr) {
     str filename;
     switch(source) {
         case AF_ANIMATION:
-            str_from_format(&filename, "fighters/fighter%d/%d/%d.png", file_id, animation, frame);
+            str_from_format(&filename, "fighters/%s/%d/%d.png", str_c(name), animation, frame);
             break;
-        case BK_ANIMATION: {
-            switch(file_id) {
-                case 8:
-                    str_from_format(&filename, "scenes/arena0/%d/%d.png", animation, frame);
-                    break;
-                case 16:
-                    str_from_format(&filename, "scenes/arena1/%d/%d.png", animation, frame);
-                    break;
-                case 32:
-                    str_from_format(&filename, "scenes/arena2/%d/%d.png", animation, frame);
-                    break;
-                case 64:
-                    str_from_format(&filename, "scenes/arena3/%d/%d.png", animation, frame);
-                    break;
-                case 128:
-                    str_from_format(&filename, "scenes/arena4/%d/%d.png", animation, frame);
-                    break;
-                default:
-                    return false;
-            }
+        case BK_ANIMATION:
+            str_from_format(&filename, "scenes/%s/%d/%d.png", str_c(name), animation, frame);
             break;
-        }
         default:
             return false;
     }
 
+    str_tolower(&filename);
+
     unsigned int len;
     if(!hashmap_get_str(&mod_resources, str_c(&filename), (void **)spr, &len)) {
         log_info("got sprite %dx%d with size %d", (*spr)->width, (*spr)->height, len);
         return true;
+    } else {
+        log_warn("MISS %s", str_c(name));
     }
 
     str_free(&filename);
@@ -250,7 +221,7 @@ bool modmanager_get_sprite(animation_source source, int file_id, int animation,
 unsigned int modmanager_count_music(str *name) {
     str filename;
 
-    str_from_format(&filename, "audio/common/music/%s.ogg", str_c(name));
+    str_from_format(&filename, "audio/music/%s.ogg", str_c(name));
     str_tolower(&filename);
 
     list *l;
@@ -270,7 +241,7 @@ unsigned int modmanager_count_music(str *name) {
 bool modmanager_get_music(str *name, unsigned int index, unsigned char **buf, size_t *buflen) {
     str filename;
 
-    str_from_format(&filename, "audio/common/music/%s.ogg", str_c(name));
+    str_from_format(&filename, "audio/music/%s.ogg", str_c(name));
     str_tolower(&filename);
 
     list *l;
@@ -500,12 +471,12 @@ bool modmanager_parse_bk_info_mod(const char *buf, bk_info *current_info) {
 }
 
 // Helper function to generate mod filename for AF moves
-bool modmanager_get_af_move(int fighter_id, int move_id, af_move *move_data) {
+bool modmanager_get_af_move(str *name, int move_id, af_move *move_data) {
     if(!move_data)
         return false;
 
     str filename;
-    str_from_format(&filename, "fighters/fighter%d/%d/animdata.ini", fighter_id, move_id);
+    str_from_format(&filename, "fighters/%s/%d/animdata.ini", name, move_id);
 
     list *l;
     unsigned int len;
@@ -544,35 +515,13 @@ bool modmanager_get_af_move(int fighter_id, int move_id, af_move *move_data) {
 }
 
 // Helper function to generate mod filename for BK animations
-bool modmanager_get_bk_animation(int arena_id, int anim_id, bk_info *bk_data) {
+bool modmanager_get_bk_animation(str *name, int anim_id, bk_info *bk_data) {
     if(!bk_data)
         return false;
 
     str filename;
 
-    // Map arena ID to index
-    int arena_index = -1;
-    switch(arena_id) {
-        case 8:
-            arena_index = 0;
-            break;
-        case 16:
-            arena_index = 1;
-            break;
-        case 32:
-            arena_index = 2;
-            break;
-        case 64:
-            arena_index = 3;
-            break;
-        case 128:
-            arena_index = 4;
-            break;
-        default:
-            return false;
-    }
-
-    str_from_format(&filename, "scenes/arena%d/%d/animdata.ini", arena_index, anim_id);
+    str_from_format(&filename, "scenes/%s/%d/animdata.ini", str_c(name), anim_id);
 
     list *l;
     unsigned int len = 0;
@@ -589,7 +538,8 @@ bool modmanager_get_bk_animation(int arena_id, int anim_id, bk_info *bk_data) {
 
     str_free(&filename);
 
-    if(!result && ((anim_id >= 6 && anim_id <= 11) || (anim_id >= 24 && anim_id <= 27))) {
+    if(!result && strncmp("arena", str_c(name), 5) == 0 &&
+       ((anim_id >= 6 && anim_id <= 11) || (anim_id >= 24 && anim_id <= 27))) {
         // TODO make sure this is an arena
         // For arenas, check for 'common' for anim_ids 6 (round), 7 (number), 8 (you lose), 9 (you win), 10 (fight),
         // 11 (ready), 24 (dust 1), 25 (dust 2), 26 (dust 3), 27 (match counters)
@@ -661,10 +611,10 @@ bool modmanager_parse_fighter_header_mod(const char *buf, af *fighter) {
 }
 
 // Helper function to load fighter header mod
-bool modmanager_get_fighter_header(int fighter_id, af *fighter) {
+bool modmanager_get_fighter_header(str *name, af *fighter) {
 
     str filename;
-    str_from_format(&filename, "fighters/fighter%d/header.ini", fighter_id);
+    str_from_format(&filename, "fighters/%s/header.ini", str_c(name));
 
     list *l;
     unsigned int len = 0;
diff --git a/src/resources/modmanager.h b/src/resources/modmanager.h
@@ -11,14 +11,14 @@
 
 bool modmanager_init(void);
 
-bool modmanager_get_bk_background(int file_id, sd_vga_image **img);
-bool modmanager_get_sprite(animation_source source, int file_id, int animation, int frame, sd_sprite **spr);
+bool modmanager_get_bk_background(str *name, sd_vga_image **img);
+bool modmanager_get_sprite(animation_source source, str *name, int animation, int frame, sd_sprite **spr);
 unsigned int modmanager_count_music(str *name);
 bool modmanager_get_music(str *name, unsigned int index, unsigned char **buf, size_t *buflen);
 
-bool modmanager_get_af_move(int fighter_id, int move_id, af_move *move_data);
-bool modmanager_get_bk_animation(int arena_id, int anim_id, bk_info *bk_data);
+bool modmanager_get_af_move(str *name, int move_id, af_move *move_data);
+bool modmanager_get_bk_animation(str *name, int anim_id, bk_info *bk_data);
 
-bool modmanager_get_fighter_header(int fighter_id, af *fighter);
+bool modmanager_get_fighter_header(str *name, af *fighter);
 
 #endif // MODMANAGER_H
diff --git a/src/utils/png_reader.c b/src/utils/png_reader.c

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include "resources/sprite.h"`
`5`	`5`	`#include <string.h>`
`6`	`6`
`7`		`-void af_create(af a, void src) {`
	`7`	`+void af_create(af a, void src, str *name) {`
`8`	`8`	`sd_af_file sdaf = (sd_af_file )src;`
`9`	`9`
`10`	`10`	`// Trivial stuff`
`@@ -32,12 +32,12 @@ void af_create(af a, void src) {`
`32`	`32`	`for(int i = 0; i < 70; i++) {`
`33`	`33`	`if(sdaf->moves[i] != NULL) {`
`34`	`34`	`af_move *move = omf_calloc(1, sizeof(af_move));`
`35`		`- af_move_create(a->id, move, &a->sprites, (void *)sdaf->moves[i], i);`
	`35`	`+ af_move_create(name, move, &a->sprites, (void *)sdaf->moves[i], i);`
`36`	`36`	`array_set(&a->moves, i, move);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- modmanager_get_fighter_header(a->id, a);`
	`40`	`+ modmanager_get_fighter_header(name, a);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`af_move af_get_move(const af a, int id) {`