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

moved SaveKey detection to a safer spot

This commit is contained in:
Thomas Jentzsch 2019-02-14 08:46:50 +01:00
parent 6bb4d67efd
commit fa66711c8a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emucore/ControllerDetector.cxx
View File

@ -25,7 +25,6 @@ string ControllerDetector::detect(const uInt8* image, uInt32 size,
const Settings& settings) const Settings& settings)
{ {
string type(controller); string type(controller);
//string type("AUTO"); // dirty hack for testing!!!
if(type == "AUTO" || settings.getBool("rominfo")) if(type == "AUTO" || settings.getBool("rominfo"))
{ {
@ -49,9 +48,7 @@ string ControllerDetector::autodetectPort(const uInt8* image, uInt32 size,
// default type joystick // default type joystick
string type = "JOYSTICK"; // TODO: remove magic strings string type = "JOYSTICK"; // TODO: remove magic strings
if (isProbablySaveKey(image, size, port)) if(usesJoystickButton(image, size, port))
type = "SAVEKEY";
else if(usesJoystickButton(image, size, port))
{ {
if(isProbablyTrakBall(image, size)) if(isProbablyTrakBall(image, size))
type = "TRAKBALL"; type = "TRAKBALL";
@ -68,6 +65,8 @@ string ControllerDetector::autodetectPort(const uInt8* image, uInt32 size,
{ {
if(usesPaddle(image, size, port, settings)) if(usesPaddle(image, size, port, settings))
type = "PADDLES"; type = "PADDLES";
if (isProbablySaveKey(image, size, port))
type = "SAVEKEY";
} }
// TODO: BOOSTERGRIP, DRIVING, MINDLINK, ATARIVOX, KIDVID // TODO: BOOSTERGRIP, DRIVING, MINDLINK, ATARIVOX, KIDVID
// not detectable: PADDLES_IAXIS, PADDLES_IAXDR // not detectable: PADDLES_IAXIS, PADDLES_IAXDR