Merge branch 'tildearrow:master' into master
This commit is contained in:
commit
8a8c8406b7
16 changed files with 118 additions and 34 deletions
|
|
@ -1002,7 +1002,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop) {
|
|||
writeLoop=true;
|
||||
}
|
||||
}
|
||||
if (nextTick()) {
|
||||
if (nextTick() || !playing) {
|
||||
done=true;
|
||||
if (!loop) {
|
||||
for (int i=0; i<song.systemLen; i++) {
|
||||
|
|
@ -1016,6 +1016,11 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop) {
|
|||
w->writeC(i);
|
||||
loopSample[i]=-1;
|
||||
}
|
||||
|
||||
if (!playing) {
|
||||
writeLoop=false;
|
||||
loopPos=-1;
|
||||
}
|
||||
}
|
||||
// get register dumps
|
||||
for (int i=0; i<song.systemLen; i++) {
|
||||
|
|
@ -1151,8 +1156,13 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop) {
|
|||
w->writeI(gd3Off-0x14);
|
||||
w->writeI(tickCount);
|
||||
if (loop) {
|
||||
w->writeI(loopPos-0x1c);
|
||||
w->writeI(tickCount-loopTick-1);
|
||||
if (loopPos==-1) {
|
||||
w->writeI(0);
|
||||
w->writeI(0);
|
||||
} else {
|
||||
w->writeI(loopPos-0x1c);
|
||||
w->writeI(tickCount-loopTick-1);
|
||||
}
|
||||
} else {
|
||||
w->writeI(0);
|
||||
w->writeI(0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue