From 7cb0371b381619b37fcf27735da3d8cbb7ffd835 Mon Sep 17 00:00:00 2001 From: michniewski Date: Fri, 8 Aug 2008 16:27:29 +0000 Subject: [PATCH] --- source/ngc/fileop.cpp | 2 +- source/ngc/snes9xGX.cpp | 5 +++-- source/ngc/sram.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/ngc/fileop.cpp b/source/ngc/fileop.cpp index 37e36cc..5df8429 100644 --- a/source/ngc/fileop.cpp +++ b/source/ngc/fileop.cpp @@ -239,7 +239,7 @@ int parseFATdirectory(int method) fatdir = diropen(currFATdir); if (fatdir == NULL) { - sprintf(msg, "Error opening %s", currFATdir); + sprintf(msg, "Couldn't find %s", currFATdir); WaitPrompt(msg); // if we can't open the previous dir, open root dir diff --git a/source/ngc/snes9xGX.cpp b/source/ngc/snes9xGX.cpp index 573c1ec..ea1f144 100644 --- a/source/ngc/snes9xGX.cpp +++ b/source/ngc/snes9xGX.cpp @@ -657,8 +657,9 @@ void SetControllers () else if (Settings.MouseMaster == true) { // some games (eg: Mario Paint) don't allow the mouse in port 2 - S9xSetController (0, CTL_MOUSE, (GCSettings.Mouse == 2), 0, 0, 0); - S9xSetController (1, CTL_JOYPAD, 1, 0, 0, 0); + S9xSetController (0, CTL_MOUSE, 0, 0, 0, 0); + if (GCSettings.Mouse == 2) S9xSetController (1, CTL_MOUSE, 1, 0, 0, 0); + else S9xSetController (1, CTL_JOYPAD, 1, 0, 0, 0); } else if (Settings.JustifierMaster == true) { diff --git a/source/ngc/sram.cpp b/source/ngc/sram.cpp index cef0483..96a0a40 100644 --- a/source/ngc/sram.cpp +++ b/source/ngc/sram.cpp @@ -250,7 +250,7 @@ LoadSRAM (int method, bool silent) if(method == METHOD_SD || method == METHOD_USB) { - changeFATInterface(GCSettings.SaveMethod); + changeFATInterface(method); sprintf (filepath, "%s/%s/%s.srm", ROOTFATDIR, GCSettings.SaveFolder, Memory.ROMFilename); offset = LoadBufferFromFAT (filepath, silent); } @@ -310,7 +310,7 @@ SaveSRAM (int method, bool silent) { if(method == METHOD_SD || method == METHOD_USB) { - changeFATInterface(GCSettings.SaveMethod); + changeFATInterface(method); sprintf (filepath, "%s/%s/%s.srm", ROOTFATDIR, GCSettings.SaveFolder, Memory.ROMFilename); offset = SaveBufferToFAT (filepath, datasize, silent); }