mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-02-02 16:00:16 +00:00
Code Issues Releases Wiki Activity

resolved conflicts introduced by merging zenorogue/hyperrogue#21

Browse Source
This commit is contained in:
Zeno Rogue
2018-06-12 23:28:06 +02:00
parent b614116129 2fde42ce3f
commit 44affc3e9d
19 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dialogs.cpp
View File

@@ -673,7 +673,7 @@ namespace dialog {
addBreak(100);
#endif
addItem(XLAT("return"), ' ');
addItem("go back", ' ');
addSelItem(XLAT("default value"), disp(ne.dft), SDLK_HOME);
addBreak(100);
@@ -826,7 +826,7 @@ namespace dialog {
getcstat = '2';
if(pages) if(displayfrZ(xr*40, i0, 1, vid.fsize, IFM("3 - ") + XLAT("all"), nlpage == 1 ? 0xD8D8C0 : 0xC0C0C0, 8))
getcstat = '3';
if(i&1) if(displayfrZ(xr*56, i0, 1, vid.fsize, IFM("0 - ") + XLAT("return"), 0xC0C0C0, 8))
if(i&1) if(displayfrZ(xr*56, i0, 1, vid.fsize, IFM(keyname(' ') + " - ") + XLAT("go back"), 0xC0C0C0, 8))
getcstat = '0';
if(i&2) if(displayfrZ(xr*72, i0, 1, vid.fsize, IFM("F1 - ") + XLAT("help"), 0xC0C0C0, 8))
getcstat = SDLK_F1;