From 7f39ec723abf65c43bfb9b73d581ebe44cb4201e Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 24 Mar 2022 01:27:53 -0500
Subject: [PATCH] SMS: overdrive 2 fixes

nice
---
 src/engine/platform/sms.cpp | 17 ++++++++++++-----
 src/engine/playback.cpp     | 12 ++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index 114d67b05..08cf568d8 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -57,7 +57,10 @@ void DivPlatformSMS::tick() {
   for (int i=0; i<4; i++) {
     chan[i].std.next();
     if (chan[i].std.hadVol) {
-      chan[i].outVol=((chan[i].vol&15)*MIN(15,chan[i].std.vol))>>4;
+      chan[i].outVol=MIN(15,chan[i].std.vol)-(15-(chan[i].vol&15));
+      if (chan[i].outVol<0) chan[i].outVol=0;
+      // old formula
+      // ((chan[i].vol&15)*MIN(15,chan[i].std.vol))>>4;
       rWrite(0x90|(i<<5)|(isMuted[i]?15:(15-(chan[i].outVol&15))));
     }
     if (chan[i].std.hadArp) {
@@ -66,8 +69,11 @@ void DivPlatformSMS::tick() {
           chan[i].baseFreq=NOTE_PERIODIC(chan[i].std.arp);
           chan[i].actualNote=chan[i].std.arp;
         } else {
-          chan[i].baseFreq=NOTE_PERIODIC(chan[i].note+chan[i].std.arp);
-          chan[i].actualNote=chan[i].note+chan[i].std.arp;
+          // TODO: check whether this weird octave boundary thing applies to other systems as well
+          int areYouSerious=chan[i].note+chan[i].std.arp;
+          while (areYouSerious>0x60) areYouSerious-=12;
+          chan[i].baseFreq=NOTE_PERIODIC(areYouSerious);
+          chan[i].actualNote=areYouSerious;
         }
         chan[i].freqChanged=true;
       }
@@ -93,10 +99,11 @@ void DivPlatformSMS::tick() {
       if (chan[i].actualNote>0x5d) chan[i].freq=0x01;
       rWrite(0x80|i<<5|(chan[i].freq&15));
       rWrite(chan[i].freq>>4);
-      if (i==2 && snNoiseMode&2) {
+      // what?
+      /*if (i==2 && snNoiseMode&2) {
         chan[3].baseFreq=chan[2].baseFreq;
         chan[3].actualNote=chan[2].actualNote;
-      }
+      }*/
       chan[i].freqChanged=false;
     }
   }
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 22e95b02d..cada57fe0 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -742,10 +742,10 @@ void DivEngine::processRow(int i, bool afterDelay) {
       if (disCont[dispatchOfChan[i]].dispatch->keyOffAffectsPorta(dispatchChanOfChan[i])) {
         chan[i].portaNote=-1;
         chan[i].portaSpeed=-1;
-        if (i==2 && sysOfChan[i]==DIV_SYSTEM_SMS) {
+        /*if (i==2 && sysOfChan[i]==DIV_SYSTEM_SMS) {
           chan[i+1].portaNote=-1;
           chan[i+1].portaSpeed=-1;
-        }
+        }*/
       }
       chan[i].scheduledSlideReset=true;
     }
@@ -763,10 +763,10 @@ void DivEngine::processRow(int i, bool afterDelay) {
       if (disCont[dispatchOfChan[i]].dispatch->keyOffAffectsPorta(dispatchChanOfChan[i])) {
         chan[i].portaNote=-1;
         chan[i].portaSpeed=-1;
-        if (i==2 && sysOfChan[i]==DIV_SYSTEM_SMS) {
+        /*if (i==2 && sysOfChan[i]==DIV_SYSTEM_SMS) {
           chan[i+1].portaNote=-1;
           chan[i+1].portaSpeed=-1;
-        }
+        }*/
       }
       chan[i].scheduledSlideReset=true;
     }
@@ -1344,10 +1344,10 @@ bool DivEngine::nextTick(bool noAccum) {
             if (disCont[dispatchOfChan[i]].dispatch->keyOffAffectsPorta(dispatchChanOfChan[i])) {
               chan[i].portaNote=-1;
               chan[i].portaSpeed=-1;
-              if (i==2 && sysOfChan[i]==DIV_SYSTEM_SMS) {
+              /*if (i==2 && sysOfChan[i]==DIV_SYSTEM_SMS) {
                 chan[i+1].portaNote=-1;
                 chan[i+1].portaSpeed=-1;
-              }
+              }*/
             }
             dispatchCmd(DivCommand(DIV_CMD_PRE_PORTA,i,false,0));
             chan[i].scheduledSlideReset=true;