otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

S3M import: fix crash on Android

Browse source
This commit is contained in:
tildearrow 2024-06-28 16:13:27 -05:00
parent d814aaebee
commit 8a8784dd5a
6 changed files with 75 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/engine/fileOps/xm.cpp
View file

@ -55,12 +55,12 @@ bool DivEngine::loadXM(unsigned char* file, size_t len) {
throw EndOfFileException(&reader,reader.tell());
}
ds.name=reader.readString(20);
ds.name=reader.readStringLatin1(20);
// 0x1a
reader.readC();
String trackerName=reader.readString(20);
String trackerName=reader.readStringLatin1(20);
unsigned short trackerVer=reader.readS();
if (trackerName!="") logV("made with %s",trackerName);
@ -230,7 +230,7 @@ bool DivEngine::loadXM(unsigned char* file, size_t len) {
headerSeek=reader.tell();
headerSeek+=reader.readI();
ins->name=reader.readString(22);
ins->name=reader.readStringLatin1(22);
ins->type=DIV_INS_AMIGA;
ins->amiga.useNoteMap=true;
@ -341,7 +341,7 @@ bool DivEngine::loadXM(unsigned char* file, size_t len) {
reader.readC(); // reserved
s->name=reader.readString(22);
s->name=reader.readStringLatin1(22);
// load sample data
s->depth=(flags&4)?DIV_SAMPLE_DEPTH_16BIT:DIV_SAMPLE_DEPTH_8BIT;