mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-20 08:27:39 +00:00
Code Issues Releases Wiki Activity

filedialog and infix moved from mapeditor.cpp to dialogs.cpp

Browse Source
This commit is contained in:
Zeno Rogue
2017-12-09 04:01:56 +01:00
parent 635d1f911c
commit 4fa764c175
6 changed files with 201 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scores.cpp
View File

@@ -133,7 +133,7 @@ void showPickScores() {
scoredisplay = i;
if(!fakescore()) {
string s = displayfor(NULL);
if(mapeditor::hasInfix(s))
if(dialog::hasInfix(s))
if(monsbox[scoredisplay] == monsterpage)
pickscore_options.push_back(make_pair(s, i));
}
@@ -159,9 +159,9 @@ void showPickScores() {
scoredisplay = d;
mouseovers = mapeditor::infix;
mouseovers = dialog::infix;
keyhandler = [] (int sym, int uni) {
if(uni == '/' && mapeditor::infix == "") monsterpage = !monsterpage; else
if(uni == '/' && dialog::infix == "") monsterpage = !monsterpage; else
if(uni >= '1' && uni <= '9') uni = uni + 1000 - '1';
else if(uni >= 1000 && uni < 1000 + size(pickscore_options)) {
scoredisplay = pickscore_options[uni - 1000].second;
@@ -169,7 +169,7 @@ void showPickScores() {
if(columns[i] == scoredisplay) swap(columns[i], columns[curcol]);
popScreen();
}
else if(mapeditor::editInfix(uni)) ;
else if(dialog::editInfix(uni)) ;
else if(doexiton(sym, uni)) popScreen();
};
}
@@ -249,7 +249,7 @@ void show() {
}
else if(sym >= 1000 && sym <= 1000+POSSCORE)
curcol = sym - 1000;
else if(sym == 't') { mapeditor::infix = ""; pushScreen(showPickScores); }
else if(sym == 't') { dialog::infix = ""; pushScreen(showPickScores); }
else if(sym == SDLK_UP || sym == 'k' || sym == 'w')
scorefrom -= 5;
else if(sym == SDLK_DOWN || sym == 'j' || sym == 'x')