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

Migration fixes.

This commit is contained in:
Christian Speckner 2020-11-28 21:04:26 +01:00
parent 730932355f
commit e3e0fc5a47
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/JoyMap.cxx
View File

@ -269,11 +269,18 @@ json JoyMap::convertLegacyMapping(string list)
json eventMapping = json::object(); json eventMapping = json::object();
eventMapping["event"] = Event::Type(event); eventMapping["event"] = Event::Type(event);
eventMapping["button"] = button;
if (button != JOY_CTRL_NONE) eventMapping["button"] = button;
if (JoyAxis(axis) != JoyAxis::NONE) {
eventMapping["axis"] = JoyAxis(axis); eventMapping["axis"] = JoyAxis(axis);
eventMapping["axisDirection"] = JoyDir(adir); eventMapping["axisDirection"] = JoyDir(adir);
}
if (hat != -1) {
eventMapping["hat"] = hat; eventMapping["hat"] = hat;
eventMapping["hatDirection"] = JoyHatDir(hdir); eventMapping["hatDirection"] = JoyHatDir(hdir);
}
eventMappings.push_back(eventMapping); eventMappings.push_back(eventMapping);
} }

3
src/common/KeyMap.cxx
View File

@ -234,7 +234,8 @@ json KeyMap::convertLegacyMapping(string list)
mapping["event"] = Event::Type(event); mapping["event"] = Event::Type(event);
mapping["key"] = StellaKey(key); mapping["key"] = StellaKey(key);
mapping["mod"] = StellaMod(mod);
if (StellaMod(mod) != StellaMod::KBDM_NONE) mapping["mod"] = StellaMod(mod);
convertedMapping.push_back(mapping); convertedMapping.push_back(mapping);
} }

2
src/common/PJoystickHandler.cxx
View File

@ -48,7 +48,7 @@ PhysicalJoystickHandler::PhysicalJoystickHandler(
try { try {
mappings = json::parse(serializedMapping); mappings = json::parse(serializedMapping);
} catch (json::exception) { } catch (json::exception) {
Logger::info("converting legacy joystrick mappings"); Logger::info("converting legacy joystick mappings");
mappings = convertLegacyMapping(serializedMapping); mappings = convertLegacyMapping(serializedMapping);
} }

3
src/common/PhysicalJoystick.cxx
View File

@ -129,11 +129,12 @@ json PhysicalJoystick::convertLegacyMapping(const string& mapping, const string&
map.erase(0, 2); map.erase(0, 2);
json mappingForMode = JoyMap::convertLegacyMapping(map); json mappingForMode = JoyMap::convertLegacyMapping(map);
mappingForMode["name"] = name;
convertedMapping[jsonName(EventMode(mode))] = mappingForMode; convertedMapping[jsonName(EventMode(mode))] = mappingForMode;
} }
convertedMapping["name"] = name;
return convertedMapping; return convertedMapping;
} }