Merge with menu_navi

--HG--
branch : yubo
hg/yubo
Inky 5 years ago
commit 3acbf83058

@ -3487,6 +3487,11 @@ class CAHInitImportCharacter : public IActionHandler
if (text)
text->setText(ucstring(savedCharacters[i]));
// first button is pushed
CCtrlButton *button = dynamic_cast<CCtrlButton*>(newLine->getCtrl("but"));
if (button && list->getNumGroup() == 0)
button->setPushed(true);
// add to the list now
newLine->setParent(list);
newLine->setParentSize(list);

@ -4631,6 +4631,7 @@ class CHandlerOutgameNaviGetKeys : public IActionHandler
if (Driver->AsyncListener.isKeyPushed(KeyUP)) event = 4;
if (Driver->AsyncListener.isKeyPushed(KeyI)) event = 5;
if (Driver->AsyncListener.isKeyPushed(KeyP)) event = 6;
if (Driver->AsyncListener.isKeyPushed(KeyE)) event = 7;
std::string id = "create";
if (pCaller->getId() == "ui:outgame:charsel")

Loading…
Cancel
Save