Skip to content

SWORD25: Add keymapper support#6770

Merged
bluegr merged 1 commit intoscummvm:masterfrom
aunnoman1:sword25-keymapper
Jul 13, 2025
Merged

SWORD25: Add keymapper support#6770
bluegr merged 1 commit intoscummvm:masterfrom
aunnoman1:sword25-keymapper

Conversation

@aunnoman1
Copy link
Contributor

No description provided.

@OMGPizzaGuy OMGPizzaGuy added the GSoC Part of a Google Summer of Code project label Jun 23, 2025
act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
engineKeyMap->addAction(act);

act = new Action("REVEALHOTSPOTS", _("Reveal all interactive hotspots (hold)"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to expand on "hold" for clarity? Presumably it means that the key/button needs to be held down in order to take effect?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
act = new Action("REVEALHOTSPOTS", _("Reveal all interactive hotspots (hold)"));
act = new Action("REVEALHOTSPOTS", _("Reveal all interactive hotspots (hold the key)"));

Copy link
Member

@sev- sev- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only two small notes and it is good to go

using namespace Sword25;

Keymap *engineKeyMap = new Keymap(Keymap::kKeymapTypeGame, "sword25-default", _("Default keymappings"));
Keymap *debugKeyMap = new Keymap(Keymap::kKeymapTypeGame, "debug", _("Debug keymappings"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this also be checked against the debug flag?


KeymapArray keymaps(2);
keymaps[0] = engineKeyMap;
keymaps[1] = debugKeyMap;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this also be checked against the debug flag?

@aunnoman1 aunnoman1 force-pushed the sword25-keymapper branch from ce71b06 to 6e4845f Compare July 10, 2025 14:05
@aunnoman1 aunnoman1 force-pushed the sword25-keymapper branch from 6e4845f to 1b9704d Compare July 10, 2025 22:08
@aunnoman1 aunnoman1 marked this pull request as ready for review July 10, 2025 22:08
@aunnoman1 aunnoman1 requested review from ccawley2011 and sev- July 10, 2025 22:11
Copy link
Member

@OMGPizzaGuy OMGPizzaGuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me.

Copy link
Member

@bluegr bluegr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me as well

@bluegr
Copy link
Member

bluegr commented Jul 13, 2025

Thanks for your work!

@bluegr bluegr merged commit f180898 into scummvm:master Jul 13, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

GSoC Part of a Google Summer of Code project

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants