The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-06-11 13:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add controller options for Mouse in port 2 and Mouse in both ports (#1031)

Browse Source
This commit is contained in:
InfiniteBlueGX 2022-10-19 18:34:04 -05:00 committed by GitHub
parent 1c7e0e43a5
commit 2e539163c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/input.cpp
View File

@ -695,7 +695,7 @@ static void decodepad (int chan, int emuChan)
S9xReportPointer(offset, (u16) cursor_x[0], (u16) cursor_y[0]);
}
/*** Mouse ***/
else if (Settings.MouseMaster && emuChan == 0)
else if (Settings.MouseMaster && emuChan < 2)
{
// buttons
offset = 0x60 + (2 * emuChan);
@ -949,8 +949,21 @@ void SetControllers()
}
else if (Settings.MouseMaster == true)
{
S9xSetController (0, CTL_MOUSE, 0, 0, 0, 0);
S9xSetController (1, CTL_JOYPAD, 1, 0, 0, 0);
if (GCSettings.Controller == CTRL_MOUSE)
{
S9xSetController (0, CTL_MOUSE, 0, 0, 0, 0);
S9xSetController (1, CTL_JOYPAD, 1, 0, 0, 0);
}
else if (GCSettings.Controller == CTRL_MOUSE_PORT2)
{
S9xSetController (0, CTL_JOYPAD, 0, 0, 0, 0);
S9xSetController (1, CTL_MOUSE, 1, 0, 0, 0);
}
else if (GCSettings.Controller == CTRL_MOUSE_BOTH_PORTS)
{
S9xSetController (0, CTL_MOUSE, 0, 0, 0, 0);
S9xSetController (1, CTL_MOUSE, 1, 0, 0, 0);
}
}
else if (Settings.JustifierMaster == true)
{

4
source/menu.cpp
View File

@ -1185,8 +1185,8 @@ static void ControllerWindowUpdate(void * ptr, int dir)
GCSettings.Controller += dir;
if(GCSettings.Controller > CTRL_PAD4)
GCSettings.Controller = CTRL_MOUSE;
if(GCSettings.Controller < CTRL_MOUSE)
GCSettings.Controller = CTRL_SCOPE;
if(GCSettings.Controller < CTRL_SCOPE)
GCSettings.Controller = CTRL_PAD4;
settingText->SetText(ctrlName[GCSettings.Controller]);

2
source/preferences.cpp
View File

@ -420,7 +420,7 @@ void FixInvalidSettings()
GCSettings.SFXVolume = 40;
if(GCSettings.language < 0 || GCSettings.language >= LANG_LENGTH)
GCSettings.language = LANG_ENGLISH;
if(GCSettings.Controller > CTRL_PAD4 || GCSettings.Controller < CTRL_MOUSE)
if(GCSettings.Controller > CTRL_PAD4 || GCSettings.Controller < CTRL_SCOPE)
GCSettings.Controller = CTRL_PAD2;
if(!(GCSettings.render >= 0 && GCSettings.render < 5))
GCSettings.render = 3;

2
source/snes9xgx.cpp
View File

@ -536,7 +536,7 @@ int main(int argc, char *argv[])
Settings.AutoDisplayMessages = (Settings.DisplayFrameRate || Settings.DisplayTime ? true : false);
Settings.MultiPlayer5Master = (GCSettings.Controller == CTRL_PAD4 ? true : false);
Settings.SuperScopeMaster = (GCSettings.Controller == CTRL_SCOPE ? true : false);
Settings.MouseMaster = (GCSettings.Controller == CTRL_MOUSE ? true : false);
Settings.MouseMaster = (GCSettings.Controller == CTRL_MOUSE || GCSettings.Controller == CTRL_MOUSE_PORT2 || GCSettings.Controller == CTRL_MOUSE_BOTH_PORTS);
Settings.JustifierMaster = (GCSettings.Controller == CTRL_JUST ? true : false);
SetControllers ();

17
source/snes9xgx.h
View File

@ -52,16 +52,27 @@ enum {
enum
{
CTRL_PAD,
CTRL_MOUSE,
CTRL_SCOPE,
CTRL_JUST,
CTRL_MOUSE,
CTRL_MOUSE_PORT2,
CTRL_MOUSE_BOTH_PORTS,
CTRL_PAD2,
CTRL_PAD4,
CTRL_LENGTH
};
const char ctrlName[6][24] =
{ "SNES Controller", "SNES Mouse", "Super Scope", "Justifier", "SNES Controllers (2)", "SNES Controllers (4)" };
const char ctrlName[8][24] =
{
"SNES Controller",
"Super Scope",
"Justifier",
"SNES Mouse (Port 1)",
"SNES Mouse (Port 2)",
"SNES Mouse (Both Ports)",
"SNES Controllers (2)",
"SNES Controllers (4)"
};
enum {
TURBO_BUTTON_RSTICK = 0,