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

removed Stell/2600-daptor renaming

This commit is contained in:
Thomas Jentzsch 2021-06-11 16:50:39 +02:00
parent 61afc41ab3
commit 6604c0d283
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/PJoystickHandler.cxx
View File

@ -100,25 +100,10 @@ int PhysicalJoystickHandler::add(const PhysicalJoystickPtr& stick)
// Figure out what type of joystick this is // Figure out what type of joystick this is
bool isAdaptor = false; bool isAdaptor = false;
if(BSPF::containsIgnoreCase(stick->name, "2600-daptor")) if(BSPF::containsIgnoreCase(stick->name, "Stelladaptor")
|| BSPF::containsIgnoreCase(stick->name, "2600-daptor"))
{ {
isAdaptor = true; isAdaptor = true;
if(stick->numAxes == 4)
{
// TODO - detect controller type based on z-axis
stick->name = "2600-daptor D9";
}
else if(stick->numAxes == 3)
{
stick->name = "2600-daptor II";
}
else
stick->name = "2600-daptor";
}
else if(BSPF::containsIgnoreCase(stick->name, "Stelladaptor"))
{
stick->name = "Stelladaptor";
isAdaptor = true;
} }
else else
{ {
@ -279,7 +264,8 @@ bool PhysicalJoystickHandler::mapStelladaptors(const string& saport, int ID)
erased = true; erased = true;
} }
if(BSPF::startsWithIgnoreCase(_stick->name, "Stelladaptor")) //if(BSPF::startsWithIgnoreCase(_stick->name, "Stelladaptor"))
if(BSPF::containsIgnoreCase(_stick->name, "Stelladaptor"))
{ {
if(saOrder[saCount] == 1) if(saOrder[saCount] == 1)
_stick->type = PhysicalJoystick::Type::LEFT_STELLADAPTOR; _stick->type = PhysicalJoystick::Type::LEFT_STELLADAPTOR;
@ -287,7 +273,8 @@ bool PhysicalJoystickHandler::mapStelladaptors(const string& saport, int ID)
_stick->type = PhysicalJoystick::Type::RIGHT_STELLADAPTOR; _stick->type = PhysicalJoystick::Type::RIGHT_STELLADAPTOR;
found = true; found = true;
} }
else if(BSPF::startsWithIgnoreCase(_stick->name, "2600-daptor")) else //if(BSPF::startsWithIgnoreCase(_stick->name, "2600-daptor"))
if(BSPF::containsIgnoreCase(_stick->name, "2600-daptor"))
{ {
if(saOrder[saCount] == 1) if(saOrder[saCount] == 1)
_stick->type = PhysicalJoystick::Type::LEFT_2600DAPTOR; _stick->type = PhysicalJoystick::Type::LEFT_2600DAPTOR;