1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-23 09:57:41 +00:00

resolved conflicts introduced by merging zenorogue/hyperrogue#21

This commit is contained in:
Zeno Rogue
2018-06-12 23:28:06 +02:00
19 changed files with 36 additions and 62 deletions

View File

@@ -473,14 +473,14 @@ void showChangeMode() {
dialog::addBreak(50);
dialog::addItem(XLAT("return to the game"), 'v');
dialog::addItem(XLAT("go back"), ' ');
dialog::display();
keyhandler = [] (int sym, int uni) {
dialog::handleNavigation(sym, uni);
char xuni = uni;
if(xuni == 'v' || sym == SDLK_ESCAPE) popScreen();
if(xuni == ' ' || sym == SDLK_ESCAPE) popScreen();
#if CAP_DAILY
else if(uni == 'z')