diff --git a/osufs/osufs/osu.cpp b/osufs/osufs/osu.cpp index 15920733210db665c3be1ae9537f1109f8691b54..cb7f695c2e47260da2c8e0cda74ab3174d415878 100644 --- a/osufs/osufs/osu.cpp +++ b/osufs/osufs/osu.cpp @@ -94,13 +94,13 @@ addr = img_write_dither64(cbuf, dev, addr, &(meta-> entry ## _w), &(meta-> entry #pragma clang diagnostic push #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) - SKIN_IMPORT_IMAGE(hit_300k, "hit300k.png", 48, -1) - SKIN_IMPORT_IMAGE(hit_300g, "hit300g.png", 48, -1) + SKIN_IMPORT_IMAGE(hit_0, "hit0.png", 72, -1) + SKIN_IMPORT_IMAGE(hit_50, "hit50.png", 72, -1) + SKIN_IMPORT_IMAGE(hit_100, "hit100.png", 72, -1) + SKIN_IMPORT_IMAGE(hit_300, "hit300.png", 72, -1) + SKIN_IMPORT_IMAGE(hit_100k, "hit100k.png", 72, -1) + SKIN_IMPORT_IMAGE(hit_300k, "hit300k.png", 72, -1) + SKIN_IMPORT_IMAGE(hit_300g, "hit300g.png", 72, -1) SKIN_IMPORT_IMAGE(pause_back, "pause-back.png", 235, -1) SKIN_IMPORT_IMAGE(pause_continue, "pause-continue.png", 235, -1) @@ -228,7 +228,6 @@ osu_song osu_read_osu(const char *filename, mdev *dev, osu_meta *meta, osu_ini_proc proc = &osu_parse_general; while (fgets(line, 1023, fp)) { - printf(line); // Trim trailing whitespace char *endc = line + strlen(line) - 1; while (isspace(*endc)) diff --git a/osufs/osufs/osu_object_analyze/osu_object_parser.cpp b/osufs/osufs/osu_object_analyze/osu_object_parser.cpp index a1c0e6f5d6093cd7a973fde4015d8632f70d9e6b..0dc11980be97a9790bb65729e2c8cfad490fbf98 100644 --- a/osufs/osufs/osu_object_analyze/osu_object_parser.cpp +++ b/osufs/osufs/osu_object_analyze/osu_object_parser.cpp @@ -39,10 +39,11 @@ int osu_parse_hit_object(char* line, osu_song* song){ elemn.color = ((song->combo_colors[combo_count][0])<<16) | ((song->combo_colors[combo_count][1])<<8) | ((song->combo_colors[combo_count][2])); + elemn.extra2 = combo_count; //hit sound int hitsound; - elemn.sound[0] = ' '; // TODO + elemn.sound[0] = 's'; // TODO elemn.sound[1] = 'h'; sscanf(v[4].c_str(),"%d",&hitsound); if (hitsound & 8) diff --git a/osufs/osufs/wavenc.c b/osufs/osufs/wavenc.c index 19241cc516a24cd9aa97366da22d475454d33661..24a848e20c33cf7c1b133a44cbafbf8691ed073c 100644 --- a/osufs/osufs/wavenc.c +++ b/osufs/osufs/wavenc.c @@ -12,7 +12,6 @@ #include <string.h> uint32_t wav_write(const char *filename, mdev *dev, uint32_t addr) { - return addr; char cbuf[1024]; int ret;