Update Mednafen to 1.24.3

OpenEmu · May 5, 2020 · e1708ac · e1708ac
1 parent 930bff6
commit e1708ac
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 10 deletions.
diff --git a/Info.plist b/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.24.2</string>
+	<string>1.24.3</string>
 	<key>NSPrincipalClass</key>
 	<string>OEGameCoreController</string>
 	<key>OEGameCoreClass</key>

diff --git a/Mednafen.xcodeproj/project.pbxproj b/Mednafen.xcodeproj/project.pbxproj
@@ -4752,9 +4752,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"1.24.2\\\"",
+					"-DMEDNAFEN_VERSION=\\\"1.24.3\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00102402",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00102403",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",
@@ -4818,9 +4818,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"1.24.2\\\"",
+					"-DMEDNAFEN_VERSION=\\\"1.24.3\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00102402",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00102403",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",

diff --git a/mednafen/ss/notes/HOST-CPU-INTENSIVE-GAMES b/mednafen/ss/notes/HOST-CPU-INTENSIVE-GAMES
@@ -1,5 +1,6 @@
 Burning Rangers
 Courier Crisis (most intensive game?)
+Dungeon Master Nexus
 DecAthlete
 Grandia (FMV)
 Last Bronx

diff --git a/mednafen/ss/notes/PROBLEMATIC-GAMES b/mednafen/ss/notes/PROBLEMATIC-GAMES
@@ -159,9 +159,12 @@ Primal Rage
 
 
 -------------------------------------------------------------------------------
-Rely on SCSP 18-bit DAC enable
+Rely on rarely-used SCSP features
 -------------------------------------------------------------------------------
-Daytona USA
+Daytona USA - 18-bit DAC enable
+
+Sega Ages: OutRun - Enables short waveform mode for the engine sound effect
+	at high engine speeds, adding a metallic roughness to the sound.
 
 
 -------------------------------------------------------------------------------

diff --git a/mednafen/ss/scsp.h b/mednafen/ss/scsp.h
@@ -77,7 +77,6 @@ class SS_SCSP
   uint32 StartAddr;	// 20 bits, memory address.
   uint16 LoopStart;	// 16 bits, in samples.
   uint16 LoopEnd;	// 16 bits, in samples.
-  uint32 ShortWaveMask;
   //
   bool KeyBit;
   //
@@ -140,8 +139,10 @@ class SS_SCSP
   int16 EffectVolume[2];	// 1.14 fixed point, derived from EFSDL and EFPAN
   //
   //
-  uint32 PhaseWhacker;
+  uint32 ShortWaveMask;
+  bool ShortWave;
   uint16 CurrentAddr;
+  uint32 PhaseWhacker;
   bool InLoop;
   bool LoopSub;
   bool WFAllowAccess;
@@ -155,6 +156,8 @@ class SS_SCSP
 
  uint16 EXTS[2];
 
+ void RecalcShortWaveMask(Slot* s);
+
  void RunEG(Slot* s, const unsigned key_eg_scale);
 
  uint8 GetALFO(Slot* s);

diff --git a/mednafen/ss/scsp.inc b/mednafen/ss/scsp.inc
@@ -95,6 +95,15 @@ void SS_SCSP::RecalcMainInt(void)	// Main CPU interrupts
  SCSP_MainIntChanged((bool)(MCIPD & MCIEB));
 }
 
+INLINE void SS_SCSP::RecalcShortWaveMask(Slot* s)
+{
+ const unsigned lev = s->LoopEnd & 0x780;
+
+ s->ShortWaveMask = 0xFFFFFFFF;
+ if(s->ShortWave && lev)
+  s->ShortWaveMask = (1U << MDFN_tzcount16(lev)) - 1;
+}
+
 void SS_SCSP::Reset(bool powering_up)
 {
  //
@@ -112,6 +121,8 @@ void SS_SCSP::Reset(bool powering_up)
   Slots[i].EnvPhase = ENV_PHASE_RELEASE;
 
   Slots[i].LFOTimeCounter = 1;
+  //
+  RecalcShortWaveMask(&Slots[i]);
  }
 
  for(unsigned i = 0; i < 2; i++)
@@ -268,6 +279,8 @@ INLINE void SS_SCSP::RW(uint32 A, T& DBV)
 
     case 0x03:
 	s->LoopEnd = SRV;
+	//
+	RecalcShortWaveMask(s);
 	break;
 
     case 0x04:
@@ -306,7 +319,9 @@ INLINE void SS_SCSP::RW(uint32 A, T& DBV)
     case 0x08:
 	s->FreqNum = SRV & 0x7FF;
 	s->Octave = (SRV >> 11) & 0xF;
-	s->ShortWaveMask = (SRV & 0x8000) ? 0x7F : 0xFFFFFFFF;
+	s->ShortWave = (SRV >> 15) & 0x1;
+	//
+	RecalcShortWaveMask(s);
 	break;
 
     case 0x09: