ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: add -cartB parameter

This commit is contained in:
OV2 2018-01-03 22:28:21 +01:00
parent ce9683db7e
commit e2f764fc0c
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
win32/wconfig.cpp
View File

@ -221,6 +221,9 @@ void WinDeleteRecentGamesList ();
HANDLE configMutex = NULL; HANDLE configMutex = NULL;
extern TCHAR multiRomA[MAX_PATH]; // lazy, should put in sGUI and add init to {0} somewhere
extern TCHAR multiRomB[MAX_PATH];
void S9xParseArg (char **argv, int &i, int argc) void S9xParseArg (char **argv, int &i, int argc)
{ {
if (strcasecmp (argv [i], "-restore") == 0) if (strcasecmp (argv [i], "-restore") == 0)
@ -236,11 +239,16 @@ void S9xParseArg (char **argv, int &i, int argc)
{ {
GUI.FullScreen = true; GUI.FullScreen = true;
} }
else if (!strcasecmp(argv[i], "-cartb"))
{
Settings.Multi = TRUE; // only used to signal winmain
if (i + 1 < argc)
{
lstrcpyn(multiRomB, _tFromChar(argv[++i]), MAX_PATH);
}
}
} }
extern TCHAR multiRomA [MAX_PATH]; // lazy, should put in sGUI and add init to {0} somewhere
extern TCHAR multiRomB [MAX_PATH];
void WinSetDefaultValues () void WinSetDefaultValues ()
{ {
// TODO: delete the parts that are already covered by the default values in WinRegisterConfigItems // TODO: delete the parts that are already covered by the default values in WinRegisterConfigItems

21
win32/wsnes9x.cpp
View File

@ -327,6 +327,9 @@ extern FILE *trace_fs;
extern SCheatData Cheat; extern SCheatData Cheat;
extern bool8 do_frame_adjust; extern bool8 do_frame_adjust;
TCHAR multiRomA[MAX_PATH] = { 0 }; // lazy, should put in sGUI and add init to {0} somewhere
TCHAR multiRomB[MAX_PATH] = { 0 };
HINSTANCE g_hInst; HINSTANCE g_hInst;
#ifdef DEBUGGER #ifdef DEBUGGER
@ -1551,10 +1554,6 @@ bool WinMoviePlay(LPCTSTR filename)
return true; return true;
} }
TCHAR multiRomA [MAX_PATH] = {0}; // lazy, should put in sGUI and add init to {0} somewhere
TCHAR multiRomB [MAX_PATH] = {0};
static bool startingMovie = false; static bool startingMovie = false;
HWND cheatSearchHWND = NULL; HWND cheatSearchHWND = NULL;
@ -3447,8 +3446,18 @@ int WINAPI WinMain(
MessageBox( GUI.hWnd, Languages[ GUI.Language].errFrameTimer, TEXT("Snes9X - Frame Timer"), MB_OK | MB_ICONINFORMATION); MessageBox( GUI.hWnd, Languages[ GUI.Language].errFrameTimer, TEXT("Snes9X - Frame Timer"), MB_OK | MB_ICONINFORMATION);
} }
if(rom_filename) if (rom_filename)
LoadROM(rom_filename); {
if (Settings.Multi) // we found -cartB parameter
{
lstrcpy(multiRomA, rom_filename); // for the mutli cart dialog
LoadROM(rom_filename, multiRomB);
}
else
{
LoadROM(rom_filename);
}
}
S9xUnmapAllControls(); S9xUnmapAllControls();
S9xSetupDefaultKeymap(); S9xSetupDefaultKeymap();