Skip to content
Snippets Groups Projects
Commit db9fa50b authored by Fang Lu's avatar Fang Lu
Browse files

osufs - fixes

* Missing hit50
* Invalid score font in sdcard
parent 50b96c7f
Branches ilufang-osufs
No related tags found
No related merge requests found
......@@ -111,9 +111,8 @@ fnt.widths[chr-' '] = w;
FONT_IMPORT_GLYPH('%', "score-percent.png")
FONT_IMPORT_GLYPH('x', "score-x.png")
blkio_write(dev, addr++, &fnt);
strncpy(fnt.magic, "oFNT", 4);
blkio_write(dev, addr++, &fnt);
return addr;
}
......@@ -95,6 +95,7 @@ addr = img_write_dither64(cbuf, dev, addr, &(meta-> entry ## _w), &(meta-> entry
#pragma clang diagnostic ignored "-Waddress-of-packed-member"
SKIN_IMPORT_IMAGE(hit_0, "hit0.png", 48, -1)
SKIN_IMPORT_IMAGE(hit_50, "hit50.png", 48, -1)
SKIN_IMPORT_IMAGE(hit_100, "hit100.png", 48, -1)
SKIN_IMPORT_IMAGE(hit_300, "hit300.png", 48, -1)
SKIN_IMPORT_IMAGE(hit_100k, "hit100k.png", 48, -1)
......
......@@ -197,7 +197,14 @@ extern "C" {
uint32_t font_24; // 400 - 403
uint32_t font_score; // 404 - 407
char _padding[104]; // 408 - 511
// Well, we missed something, to keep the memory layout, we decided
// to add them here...
uint32_t hit_50; // 408 - 411
uint16_t hit_50_w; // 412 - 413
uint16_t hit_50_h; // 414 - 415
char _padding[96]; // 416 - 511
} osu_meta;
typedef struct __attribute__((__packed__)) osu_font_t {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment