Bugfix for stray bass and broken channel volume #2

leecher1337 · Sep 27, 2023 · e2b1269 · e2b1269
1 parent 67be2a7
commit e2b1269
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/essplaymid/NATV.C b/src/essplaymid/NATV.C
@@ -427,7 +427,7 @@ void NATV_CalcNewVolume(BYTE bChannel)
         if ((voice->flags1 & 1) && (voice->bChannel == bChannel || bChannel == 0xFF)) 
         {
             for (j=0; j < OPS_PER_CHAN; j++)
-                fmwrite(i * 32 + j * 8 + 1, NATV_CalcVolume(voice->reg1[j], (voice->bVelocity & 3), voice->bChannel));
+				fmwrite(i * 32 + j * 8 + 1, NATV_CalcVolume(voice->reg1[j], (voice->bVelocity >> (j*2)) & 3, voice->bChannel));
         }
     }   
 }
@@ -714,7 +714,7 @@ void  setup_operator(
     {
         transpose = ((((gBankMem[offset + 5]) << 2) & 0x7F) | (gBankMem[offset + 4] & 3));
         if (gBankMem[offset + 5] & 0x10) // signed?
-            transpose *= -1;
+            transpose |= ~0x7F;
         note += transpose;
     }
 

diff --git a/src/res.rc b/src/res.rc
@@ -312,8 +312,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 1,0,0,3
+ PRODUCTVERSION 1,0,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -331,14 +331,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "leecher1337\0"
             VALUE "FileDescription", "esfmbank\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "FileVersion", "1, 0, 0, 3\0"
             VALUE "InternalName", "esfmbank\0"
             VALUE "LegalCopyright", "Copyright � 2023 [email protected]\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "esfmbank.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "ESFM bank editor\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "ProductVersion", "1, 0, 0, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END