The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-27 21:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

nunchuk fix, add sound sync

Browse Source
This commit is contained in:
dborth 2008-10-03 22:39:14 +00:00
parent 463cd3b7e5
commit ee0e5bf02e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/ngc/input.cpp
View File

@ -299,13 +299,13 @@ void decodepad (int pad)
{ {
/*** we don't want division by zero ***/ /*** we don't want division by zero ***/
if (wm_ax > 0 && wm_ay == 0) if (wm_ax > 0 && wm_ay == 0)
wp |= WPAD_BUTTON_RIGHT | WPAD_CLASSIC_BUTTON_RIGHT; wp |= WPAD_BUTTON_RIGHT;
if (wm_ax < 0 && wm_ay == 0) if (wm_ax < 0 && wm_ay == 0)
wp |= WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT; wp |= WPAD_BUTTON_LEFT;
if (wm_ax == 0 && wm_ay > 0) if (wm_ax == 0 && wm_ay > 0)
wp |= WPAD_BUTTON_UP | WPAD_CLASSIC_BUTTON_UP; wp |= WPAD_BUTTON_UP;
if (wm_ax == 0 && wm_ay < 0) if (wm_ax == 0 && wm_ay < 0)
wp |= WPAD_BUTTON_DOWN | WPAD_CLASSIC_BUTTON_DOWN; wp |= WPAD_BUTTON_DOWN;
if (wm_ax != 0 && wm_ay != 0) if (wm_ax != 0 && wm_ay != 0)
{ {
@ -314,9 +314,9 @@ void decodepad (int pad)
if (t >= -2.41421356237 && t < 2.41421356237) if (t >= -2.41421356237 && t < 2.41421356237)
{ {
if (wm_ax >= 0) if (wm_ax >= 0)
wp |= WPAD_BUTTON_RIGHT | WPAD_CLASSIC_BUTTON_RIGHT; wp |= WPAD_BUTTON_RIGHT;
else else
wp |= WPAD_BUTTON_LEFT | WPAD_CLASSIC_BUTTON_LEFT; wp |= WPAD_BUTTON_LEFT;
} }
/*** Recalc up / down ***/ /*** Recalc up / down ***/
@ -324,9 +324,9 @@ void decodepad (int pad)
if (t >= -2.41421356237 && t < 2.41421356237) if (t >= -2.41421356237 && t < 2.41421356237)
{ {
if (wm_ay >= 0) if (wm_ay >= 0)
wp |= WPAD_BUTTON_UP | WPAD_CLASSIC_BUTTON_UP; wp |= WPAD_BUTTON_UP;
else else
wp |= WPAD_BUTTON_DOWN | WPAD_CLASSIC_BUTTON_DOWN; wp |= WPAD_BUTTON_DOWN;
} }
} }
} }

6
source/ngc/s9xconfig.cpp
View File

@ -75,10 +75,8 @@ DefaultSettings ()
Settings.MultiPlayer5Master = false; Settings.MultiPlayer5Master = false;
Settings.JustifierMaster = false; Settings.JustifierMaster = false;
Settings.ShutdownMaster = false; Settings.ShutdownMaster = false;
//Settings.CyclesPercentage = 100; // snes9x 1.50 and earlier
Settings.ApplyCheats = true; Settings.ApplyCheats = true;
// Specific to snes9x 1.51
Settings.BlockInvalidVRAMAccess = true; Settings.BlockInvalidVRAMAccess = true;
Settings.HDMATimingHack = 100; Settings.HDMATimingHack = 100;
@ -89,6 +87,8 @@ DefaultSettings ()
Settings.Stereo = true; Settings.Stereo = true;
Settings.SixteenBitSound = true; Settings.SixteenBitSound = true;
Settings.SoundEnvelopeHeightReading = true; Settings.SoundEnvelopeHeightReading = true;
Settings.SoundSync = true;
Settings.FixFrequency = false;
Settings.DisableSampleCaching = true; Settings.DisableSampleCaching = true;
Settings.InterpolatedSound = true; Settings.InterpolatedSound = true;
Settings.ReverseStereo = false; Settings.ReverseStereo = false;
@ -99,7 +99,7 @@ DefaultSettings ()
Settings.SkipFrames = 10; Settings.SkipFrames = 10;
Settings.TurboSkipFrames = 19; Settings.TurboSkipFrames = 19;
Settings.DisplayFrameRate = false; Settings.DisplayFrameRate = false;
Settings.AutoDisplayMessages = 0; // SNES9x 1.51 Settings.AutoDisplayMessages = 0;
Settings.InitialInfoStringTimeout = 200; // # frames to display messages for Settings.InitialInfoStringTimeout = 200; // # frames to display messages for
// Frame timings in 50hz and 60hz cpu mode // Frame timings in 50hz and 60hz cpu mode