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

Fixed bug in RLE decompressor, added order list

Browse source
This commit is contained in:
techmetx11 2024-04-10 16:39:03 +00:00
parent c2ad98b998
commit 9f26257364
No known key found for this signature in database
GPG key ID: 20E0C88A0E7E5AF2
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/engine/fileOps/tfm.cpp
View file

@ -45,7 +45,9 @@ class TFMRLEReader {
do { do {
rleTag=readC(); rleTag=readC();
tagLenLeft|=(rleTag&0x7F)<<lenShift; tagLenLeft|=(rleTag&0x7F)<<lenShift;
lenShift++; lenShift += 7;
logD("RLE tag: %X, len shift: %d, len left: %d", rleTag, lenShift, tagLenLeft);
// sync back since we've already read one character // sync back since we've already read one character
tagLenLeft--; tagLenLeft--;
} while (!(rleTag&0x80)); } while (!(rleTag&0x80));
@ -107,7 +109,9 @@ public:
void read(unsigned char* b, size_t l) { void read(unsigned char* b, size_t l) {
int i=0; int i=0;
while(l--) { while(l--) {
b[i++]=readC(); unsigned char nextChar = readC();
b[i++]=nextChar;
logD("read next char: %x, index: %d", nextChar, i);
} }
} }
@ -200,7 +204,7 @@ bool DivEngine::loadTFM(unsigned char* file, size_t len) {
// notes // notes
logD("parsing notes"); logD("parsing notes");
reader.read(buffer, 384); reader.read(buffer,384);
String notes((const char*)buffer,strnlen((const char*)buffer,384)); String notes((const char*)buffer,strnlen((const char*)buffer,384));
// fix \r\n to \n // fix \r\n to \n
@ -210,6 +214,17 @@ bool DivEngine::loadTFM(unsigned char* file, size_t len) {
} }
} }
// order list
logD("parsing order list");
unsigned char orderList[256];
reader.read(orderList,256);
for (int i=0; i<ds.subsong[0]->ordersLen;i++) {
for (int j=0; j<6; j++) {
ds.subsong[0]->orders.ord[j][i]=orderList[i];
}
}
ds.notes=notes; ds.notes=notes;
BUSY_BEGIN_SOFT; BUSY_BEGIN_SOFT;
saveLock.lock(); saveLock.lock();