nishi/nishbox
1
Fork 0
mirror of https://github.com/nishiowo/nishbox synced 2025-04-21 12:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing jar so it compiles on vs2010

Browse Source
This commit is contained in:
NishiOwO 2025-04-20 15:54:58 +09:00
parent add347597c
commit 38d6625cc5
No known key found for this signature in database
GPG Key ID: 27EF69B208EB9343
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/external/jar/jar_xm.h vendored
View File

@ -871,6 +871,8 @@ char* jar_xm_load_module(jar_xm_context_t* ctx, const char* moddata, size_t modd
jar_xm_module_t* mod = &(ctx->module); jar_xm_module_t* mod = &(ctx->module);
gf_uint16_t i; gf_uint16_t i;
gf_uint16_t j; gf_uint16_t j;
gf_uint32_t header_size;
gf_uint16_t flags;
/* Read XM header */ /* Read XM header */
READ_MEMCPY(mod->name, offset + 17, MODULE_NAME_LENGTH); READ_MEMCPY(mod->name, offset + 17, MODULE_NAME_LENGTH);
@ -878,7 +880,7 @@ char* jar_xm_load_module(jar_xm_context_t* ctx, const char* moddata, size_t modd
offset += 60; offset += 60;
/* Read module header */ /* Read module header */
gf_uint32_t header_size = READ_U32(offset); header_size = READ_U32(offset);
mod->length = READ_U16(offset + 4); mod->length = READ_U16(offset + 4);
mod->restart_position = READ_U16(offset + 6); mod->restart_position = READ_U16(offset + 6);
@ -892,7 +894,7 @@ char* jar_xm_load_module(jar_xm_context_t* ctx, const char* moddata, size_t modd
mod->instruments = (jar_xm_instrument_t*)mempool; mod->instruments = (jar_xm_instrument_t*)mempool;
mempool += mod->num_instruments * sizeof(jar_xm_instrument_t); mempool += mod->num_instruments * sizeof(jar_xm_instrument_t);
gf_uint16_t flags = READ_U32(offset + 14); flags = READ_U32(offset + 14);
mod->frequency_type = (flags & (1 << 0)) ? jar_xm_LINEAR_FREQUENCIES : jar_xm_AMIGA_FREQUENCIES; mod->frequency_type = (flags & (1 << 0)) ? jar_xm_LINEAR_FREQUENCIES : jar_xm_AMIGA_FREQUENCIES;
ctx->tempo = READ_U16(offset + 16); ctx->tempo = READ_U16(offset + 16);