libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA4: Fixes to Ultima 5 style mix menu

Browse Source
This commit is contained in:
Paul Gilbert 2020-08-18 19:19:34 -07:00
parent 7053648484
commit 3403e82cc4
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
engines/ultima/ultima4/controllers/reagents_menu_controller.cpp
View File

@ -37,33 +37,14 @@ bool ReagentsMenuController::keyPressed(int key) {
case 'f':
case 'g':
case 'h': {
/* select the corresponding reagent (if visible) */
// Select the corresponding reagent (if visible)
Menu::MenuItemList::iterator mi = _menu->getById(key - 'a');
if ((*mi)->isVisible()) {
_menu->setCurrent(_menu->getById(key - 'a'));
keyPressed(Common::KEYCODE_SPACE);
}
break;
}
break;
case Common::KEYCODE_LEFT:
case Common::KEYCODE_RIGHT:
case Common::KEYCODE_SPACE:
if (_menu->isVisible()) {
MenuItem *item = *_menu->getCurrent();
/* change whether or not it's selected */
item->setSelected(!item->isSelected());
if (item->isSelected())
_ingredients->addReagent((Reagent)item->getId());
else
_ingredients->removeReagent((Reagent)item->getId());
}
break;
case Common::KEYCODE_RETURN:
eventHandler->setControllerDone();
break;
default:
return MenuController::keyPressed(key);
@ -73,9 +54,41 @@ bool ReagentsMenuController::keyPressed(int key) {
}
void ReagentsMenuController::keybinder(KeybindingAction action) {
if (action == KEYBIND_ESCAPE) {
switch (action) {
case KEYBIND_ESCAPE:
_ingredients->revert();
eventHandler->setControllerDone();
break;
case KEYBIND_UP:
_menu->prev();
break;
case KEYBIND_DOWN:
_menu->next();
break;
case KEYBIND_LEFT:
case KEYBIND_RIGHT:
if (_menu->isVisible()) {
MenuItem *item = *_menu->getCurrent();
// change whether or not it's selected
item->setSelected(!item->isSelected());
if (item->isSelected())
_ingredients->addReagent((Reagent)item->getId());
else
_ingredients->removeReagent((Reagent)item->getId());
}
break;
case KEYBIND_INTERACT:
eventHandler->setControllerDone();
break;
default:
break;
}
}

2
engines/ultima/ultima4/core/debugger.cpp
View File

@ -808,7 +808,7 @@ bool Debugger::cmdMixReagents(int argc, const char **argv) {
break;
int spell = choice - 'a';
print("%s", g_spells->spellGetName(spell));
print("\n%s", g_spells->spellGetName(spell));
// ensure the mixtures for the spell isn't already maxed out
if (g_ultima->_saveGame->_mixtures[spell] == 99) {