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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2020-12-01 22:21:35 +01:00
parent 48e3f85a9f 60d50a23f0
commit 303b9b3c83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/jsonDefinitions.hxx
View File

@ -27,7 +27,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(JoyHatDir, {
{JoyHatDir::LEFT, "left"}, {JoyHatDir::LEFT, "left"},
{JoyHatDir::RIGHT, "right"}, {JoyHatDir::RIGHT, "right"},
{JoyHatDir::UP, "up"} {JoyHatDir::UP, "up"}
}); })
NLOHMANN_JSON_SERIALIZE_ENUM(EventMode, { NLOHMANN_JSON_SERIALIZE_ENUM(EventMode, {
{EventMode::kEditMode, "kEditMode"}, {EventMode::kEditMode, "kEditMode"},
@ -39,7 +39,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(EventMode, {
{EventMode::kCompuMateMode, "kCompuMateMode"}, {EventMode::kCompuMateMode, "kCompuMateMode"},
{EventMode::kCommonMode, "kCommonMode"}, {EventMode::kCommonMode, "kCommonMode"},
{EventMode::kNumModes, "kNumModes"}, {EventMode::kNumModes, "kNumModes"},
}); })
NLOHMANN_JSON_SERIALIZE_ENUM(Event::Type, { NLOHMANN_JSON_SERIALIZE_ENUM(Event::Type, {
{Event::NoType, "NoType"}, {Event::NoType, "NoType"},