Mercurial > hg > dmlib
changeset 1250:99852310dc02
Some more work on the loader.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 07 Mar 2015 19:37:35 +0200 |
parents | c44fcdc1c2e7 |
children | 75e20c34bb6a |
files | minijss/jloadjss.c |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/minijss/jloadjss.c Sat Mar 07 19:25:35 2015 +0200 +++ b/minijss/jloadjss.c Sat Mar 07 19:37:35 2015 +0200 @@ -267,11 +267,11 @@ int i; // Read envelope data - if (!dmf_read_le16(inFile, &jssEnv.flags) || - !dmf_read_le16(inFile, &jssEnv.npoints) || - !dmf_read_le16(inFile, &jssEnv.sustain) || - !dmf_read_le16(inFile, &jssEnv.loopS) || - !dmf_read_le16(inFile, &jssEnv.loopE)) + if (!dmf_read_byte(inFile, &jssEnv.flags) || + !dmf_read_byte(inFile, &jssEnv.npoints) || + !dmf_read_byte(inFile, &jssEnv.sustain) || + !dmf_read_byte(inFile, &jssEnv.loopS) || + !dmf_read_byte(inFile, &jssEnv.loopE)) JSSERROR(DMERR_FREAD, DMERR_FREAD, "Failed to read %s-envelope data for instrument #%d.\n", name, ninst); @@ -397,7 +397,7 @@ for (index = 0; index < module->norders; index++) { Uint16 tmp; - if (!dm_fread_le16(inFile, &tmp)) + if (!dmf_read_le16(inFile, &tmp)) JSSERROR(DMERR_FREAD, DMERR_FREAD, "Failed to read orders list entry #%d.\n", index);