Merge branch 'master' of https://github.com/tildearrow/furnace into n163

This commit is contained in:
cam900 2022-03-24 03:22:33 +09:00
commit e8d567d3df
14 changed files with 449 additions and 46 deletions

View file

@ -1236,14 +1236,24 @@ void DivEngine::nextRow() {
if (haltOn==DIV_HALT_PATTERN) halted=true;
}
if (speedAB) {
ticks=speed2*(song.timeBase+1);
nextSpeed=speed1;
if (song.brokenSpeedSel) {
if ((song.patLen&1) && curOrder&1) {
ticks=((curRow&1)?speed2:speed1)*(song.timeBase+1);
nextSpeed=(curRow&1)?speed1:speed2;
} else {
ticks=((curRow&1)?speed1:speed2)*(song.timeBase+1);
nextSpeed=(curRow&1)?speed2:speed1;
}
} else {
ticks=speed1*(song.timeBase+1);
nextSpeed=speed2;
if (speedAB) {
ticks=speed2*(song.timeBase+1);
nextSpeed=speed1;
} else {
ticks=speed1*(song.timeBase+1);
nextSpeed=speed2;
}
speedAB=!speedAB;
}
speedAB=!speedAB;
// post row details
for (int i=0; i<chans; i++) {