Skip to content

TOLTECS: Add keymapper support#6522

Merged
sev- merged 1 commit intoscummvm:masterfrom
aunnoman1:toltecs-keymapper
Apr 1, 2025
Merged

TOLTECS: Add keymapper support#6522
sev- merged 1 commit intoscummvm:masterfrom
aunnoman1:toltecs-keymapper

Conversation

@aunnoman1
Copy link
Contributor

No description provided.

@sev- sev- added the GSoC Part of a Google Summer of Code project label Mar 30, 2025
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.

Good shape, I have only couple of minor notes

_returnToGame = true;

Common::Keymapper *keymapper = _vm->getEventManager()->getKeymapper();
keymapper->getKeymap("toltecs-default")->setEnabled(false);
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
keymapper->getKeymap("toltecs-default")->setEnabled(false);
// Now we turn off the keymapper so it does not interfere with full text input
keymapper->getKeymap("toltecs-default")->setEnabled(false);

if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
switch (event.customType) {
case (kActionSkipMovie):
Copy link
Member

Choose a reason for hiding this comment

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

why?

Suggested change
case (kActionSkipMovie):
case kActionSkipMovie:

and it other places


#include "toltecs/console.h"

#include "backends/keymapper/action.h"
Copy link
Member

Choose a reason for hiding this comment

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

Are these needed here? We try to minimize include dependencies.

@aunnoman1 aunnoman1 requested a review from sev- March 30, 2025 12:52
@aunnoman1
Copy link
Contributor Author

Thank you for the suggestions @OMGPizzaGuy . I've implemented them.

ALso fixed an issue which made joystick binds not work in game menu by readjusting where the keymaps are enabled and disabled

@aunnoman1 aunnoman1 requested a review from OMGPizzaGuy March 31, 2025 22:35
@sev-
Copy link
Member

sev- commented Apr 1, 2025

OK, thank you!

@sev- sev- merged commit 05d40f9 into scummvm:master Apr 1, 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.

3 participants