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

win32: make controller command line parameters work

This commit is contained in:
OV2 2013-06-16 12:53:28 +02:00
parent 44cd82a966
commit 7bd0e2af33
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
win32/wconfig.cpp
View File

@ -268,11 +268,6 @@ void WinSetDefaultValues ()
// CPU options // CPU options
Settings.Paused = false; Settings.Paused = false;
// ROM image and peripheral options
Settings.MultiPlayer5Master = false;
Settings.SuperScopeMaster = false;
Settings.MouseMaster = false;
#ifdef NETPLAY_SUPPORT #ifdef NETPLAY_SUPPORT
Settings.Port = 1996; Settings.Port = 1996;
NetPlay.MaxFrameSkip = 10; NetPlay.MaxFrameSkip = 10;

20
win32/wsnes9x.cpp
View File

@ -730,64 +730,47 @@ void ChangeInputDevice(void)
Settings.SuperScopeMaster = false; Settings.SuperScopeMaster = false;
Settings.MultiPlayer5Master = false; Settings.MultiPlayer5Master = false;
CheckMenuItem(GUI.hMenu, IDM_ENABLE_MULTITAP, MFS_UNCHECKED);
CheckMenuItem(GUI.hMenu, IDM_JUSTIFIER, MFS_UNCHECKED);
CheckMenuItem(GUI.hMenu, IDM_MOUSE_TOGGLE, MFS_UNCHECKED);
CheckMenuItem(GUI.hMenu, IDM_SCOPE_TOGGLE, MFS_UNCHECKED);
CheckMenuItem(GUI.hMenu, IDM_MOUSE_SWAPPED, MFS_UNCHECKED);
CheckMenuItem(GUI.hMenu, IDM_JUSTIFIERS, MFS_UNCHECKED);
CheckMenuItem(GUI.hMenu, IDM_MULTITAP8, MFS_UNCHECKED);
CheckMenuItem(GUI.hMenu, IDM_SNES_JOYPAD, MFS_UNCHECKED);
switch(GUI.ControllerOption) switch(GUI.ControllerOption)
{ {
case SNES_MOUSE: case SNES_MOUSE:
Settings.MouseMaster = true; Settings.MouseMaster = true;
S9xSetController(0, CTL_MOUSE, 0, 0, 0, 0); S9xSetController(0, CTL_MOUSE, 0, 0, 0, 0);
S9xSetController(1, CTL_JOYPAD, 1, 0, 0, 0); S9xSetController(1, CTL_JOYPAD, 1, 0, 0, 0);
CheckMenuItem(GUI.hMenu, IDM_MOUSE_TOGGLE, MFS_CHECKED);
break; break;
case SNES_MOUSE_SWAPPED: case SNES_MOUSE_SWAPPED:
Settings.MouseMaster = true; Settings.MouseMaster = true;
S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0); S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0);
S9xSetController(1, CTL_MOUSE, 1, 0, 0, 0); S9xSetController(1, CTL_MOUSE, 1, 0, 0, 0);
CheckMenuItem(GUI.hMenu, IDM_MOUSE_SWAPPED, MFS_CHECKED);
break; break;
case SNES_SUPERSCOPE: case SNES_SUPERSCOPE:
Settings.SuperScopeMaster = true; Settings.SuperScopeMaster = true;
S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0); S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0);
S9xSetController(1, CTL_SUPERSCOPE, 0, 0, 0, 0); S9xSetController(1, CTL_SUPERSCOPE, 0, 0, 0, 0);
CheckMenuItem(GUI.hMenu, IDM_SCOPE_TOGGLE, MFS_CHECKED);
break; break;
case SNES_MULTIPLAYER5: case SNES_MULTIPLAYER5:
Settings.MultiPlayer5Master = true; Settings.MultiPlayer5Master = true;
S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0); S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0);
S9xSetController(1, CTL_MP5, 1, 2, 3, 4); S9xSetController(1, CTL_MP5, 1, 2, 3, 4);
CheckMenuItem(GUI.hMenu, IDM_ENABLE_MULTITAP, MFS_CHECKED);
break; break;
case SNES_MULTIPLAYER8: case SNES_MULTIPLAYER8:
Settings.MultiPlayer5Master = true; Settings.MultiPlayer5Master = true;
S9xSetController(0, CTL_MP5, 0, 1, 2, 3); S9xSetController(0, CTL_MP5, 0, 1, 2, 3);
S9xSetController(1, CTL_MP5, 4, 5, 6, 7); S9xSetController(1, CTL_MP5, 4, 5, 6, 7);
CheckMenuItem(GUI.hMenu, IDM_ENABLE_MULTITAP, MFS_CHECKED);
break; break;
case SNES_JUSTIFIER: case SNES_JUSTIFIER:
Settings.JustifierMaster = true; Settings.JustifierMaster = true;
S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0); S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0);
S9xSetController(1, CTL_JUSTIFIER, 0, 0, 0, 0); S9xSetController(1, CTL_JUSTIFIER, 0, 0, 0, 0);
CheckMenuItem(GUI.hMenu, IDM_JUSTIFIER, MFS_CHECKED);
break; break;
case SNES_JUSTIFIER_2: case SNES_JUSTIFIER_2:
Settings.JustifierMaster = true; Settings.JustifierMaster = true;
S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0); S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0);
S9xSetController(1, CTL_JUSTIFIER, 1, 0, 0, 0); S9xSetController(1, CTL_JUSTIFIER, 1, 0, 0, 0);
CheckMenuItem(GUI.hMenu, IDM_JUSTIFIERS, MFS_CHECKED);
break; break;
default: default:
case SNES_JOYPAD: case SNES_JOYPAD:
S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0); S9xSetController(0, CTL_JOYPAD, 0, 0, 0, 0);
S9xSetController(1, CTL_JOYPAD, 1, 0, 0, 0); S9xSetController(1, CTL_JOYPAD, 1, 0, 0, 0);
CheckMenuItem(GUI.hMenu, IDM_SNES_JOYPAD, MFS_CHECKED);
break; break;
} }
@ -3367,6 +3350,8 @@ int WINAPI WinMain(
ConfigFile::SetAlphaSort(false); ConfigFile::SetAlphaSort(false);
ConfigFile::SetTimeSort(false); ConfigFile::SetTimeSort(false);
ChangeInputDevice();
strcpy(cmdLine,_tToChar(GetCommandLine())); strcpy(cmdLine,_tToChar(GetCommandLine()));
const char *rom_filename = WinParseCommandLineAndLoadConfigFile (cmdLine); const char *rom_filename = WinParseCommandLineAndLoadConfigFile (cmdLine);
WinSaveConfigFile (); WinSaveConfigFile ();
@ -3441,7 +3426,6 @@ int WINAPI WinMain(
S9xUnmapAllControls(); S9xUnmapAllControls();
S9xSetupDefaultKeymap(); S9xSetupDefaultKeymap();
ChangeInputDevice();
DWORD lastTime = timeGetTime(); DWORD lastTime = timeGetTime();