Merge branch 'master' into feature/esfm

This commit is contained in:
Kagamiin~ 2023-12-15 09:15:05 -03:00
commit f42332f2c0
179 changed files with 14990 additions and 745 deletions

View file

@ -1522,6 +1522,11 @@ void DivEngine::playSub(bool preserveDrift, int goalRow) {
while (playing && curOrder<goal) {
if (nextTick(preserveDrift)) {
skipping=false;
cmdStream.clear();
for (int i=0; i<song.systemLen; i++) disCont[i].dispatch->setSkipRegisterWrites(false);
if (goal>0 || goalRow>0) {
for (int i=0; i<song.systemLen; i++) disCont[i].dispatch->forceIns();
}
return;
}
if (!preserveDrift) {
@ -1533,6 +1538,11 @@ void DivEngine::playSub(bool preserveDrift, int goalRow) {
while (playing && (curRow<goalRow || ticks>1)) {
if (nextTick(preserveDrift)) {
skipping=false;
cmdStream.clear();
for (int i=0; i<song.systemLen; i++) disCont[i].dispatch->setSkipRegisterWrites(false);
if (goal>0 || goalRow>0) {
for (int i=0; i<song.systemLen; i++) disCont[i].dispatch->forceIns();
}
return;
}
if (!preserveDrift) {