mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-20 16:37:40 +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

2
hyper.h
View File

@@ -1446,6 +1446,8 @@ namespace dialog {
item& lastItem();
extern unsigned int *palette;
string keyname(int k);
void addSelItem(string body, string value, int key);
void addBoolItem(string body, bool value, int key);