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

fix (partially) #494 (ToDo: Stelladaptor)

This commit is contained in:
Thomas Jentzsch 2019-08-15 09:32:01 +02:00
parent b532d5a6ee
commit 4c430556b3
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/PJoystickHandler.cxx
View File

@ -117,6 +117,7 @@ int PhysicalJoystickHandler::add(PhysicalJoystickPtr stick)
{ {
it->second.joy = stick; it->second.joy = stick;
stick->setMap(it->second.mapping); stick->setMap(it->second.mapping);
enableEmulationMappings();
} }
else // adding for the first time else // adding for the first time
{ {

1
src/emucore/EventHandler.hxx
View File

@ -177,7 +177,6 @@ class EventHandler
return myPKeyHandler->getMappingDesc(event, mode); return myPKeyHandler->getMappingDesc(event, mode);
} }
Event::Type eventAtIndex(int idx, EventMode mode) const; Event::Type eventAtIndex(int idx, EventMode mode) const;
string actionAtIndex(int idx, EventMode mode) const; string actionAtIndex(int idx, EventMode mode) const;
string keyAtIndex(int idx, EventMode mode) const; string keyAtIndex(int idx, EventMode mode) const;

3
src/gui/EventMappingWidget.cxx
View File

@ -131,6 +131,9 @@ void EventMappingWidget::loadConfig()
myActionsList->setSelected(0); myActionsList->setSelected(0);
myFirstTime = false; myFirstTime = false;
} }
else
// controller IDs may have changed in between
drawKeyMapping();
// Make sure remapping is turned off, just in case the user didn't properly // Make sure remapping is turned off, just in case the user didn't properly
// exit last time // exit last time