etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-02 02:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

S3M import: pattern data, part 4

Browse source
This commit is contained in:
tildearrow 2024-06-22 18:21:31 -05:00
parent 2782123565
commit 08bf019f7f
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/engine/fileOps/s3m.cpp
View file

@ -622,12 +622,15 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
memcpy(vibingOld,vibing,32*sizeof(bool)); memcpy(vibingOld,vibing,32*sizeof(bool));
memcpy(volSlidingOld,volSliding,32*sizeof(bool)); memcpy(volSlidingOld,volSliding,32*sizeof(bool));
memcpy(portingOld,porting,32*sizeof(bool)); memcpy(portingOld,porting,32*sizeof(bool));
memcpy(arpingOld,arping,32*sizeof(bool));
memset(vibStatusChanged,0,32*sizeof(bool)); memset(vibStatusChanged,0,32*sizeof(bool));
memset(volSlideStatusChanged,0,32*sizeof(bool)); memset(volSlideStatusChanged,0,32*sizeof(bool));
memset(portaStatusChanged,0,32*sizeof(bool)); memset(portaStatusChanged,0,32*sizeof(bool));
memset(arpStatusChanged,0,32*sizeof(bool));
memset(vibing,0,32*sizeof(bool)); memset(vibing,0,32*sizeof(bool));
memset(volSliding,0,32*sizeof(bool)); memset(volSliding,0,32*sizeof(bool));
memset(porting,0,32*sizeof(bool)); memset(porting,0,32*sizeof(bool));
memset(arping,0,32*sizeof(bool));
memset(did,0,32); memset(did,0,32);
if (curRow>=64) break; if (curRow>=64) break;
continue; continue;
@ -695,6 +698,7 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
p->data[curRow][effectCol[chan]++]=effectVal; p->data[curRow][effectCol[chan]++]=effectVal;
break; break;
case 'B': // go to order case 'B': // go to order
// TODO: handle subsongs and spacing
p->data[curRow][effectCol[chan]++]=0x0b; p->data[curRow][effectCol[chan]++]=0x0b;
p->data[curRow][effectCol[chan]++]=effectVal; p->data[curRow][effectCol[chan]++]=effectVal;
break; break;
@ -803,9 +807,16 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
} }
} }
} }
}
// copy patterns to the rest of subsongs // copy patterns to the rest of subsongs
for (size_t i=1; i<ds.subsong.size(); i++) {
for (int j=0; j<DIV_MAX_CHANS; j++) {
for (int k=0; k<patCount; k++) {
if (ds.subsong[0]->pat[j].data[k]) ds.subsong[0]->pat[j].data[k]->copyOn(ds.subsong[i]->pat[j].getPattern(k,true));
}
}
}
}
if (active) quitDispatch(); if (active) quitDispatch();
BUSY_BEGIN_SOFT; BUSY_BEGIN_SOFT;