mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-07-04 01:12:43 +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
config.cpp
+13 -10
View File
@@ -554,7 +554,7 @@ void loadConfig() {
void showAllConfig() {
dialog::addBreak(50);
dialog::addItem(XLAT("exit configuration"), 'v');
dialog::addItem(XLAT("go back"), ' ');
#if CAP_CONFIG
dialog::addItem(XLAT("save the current config"), 's');
if(getcstat == 's')
@@ -565,7 +565,7 @@ void showAllConfig() {
void handleAllConfig(int sym, int uni) {
if(sym == SDLK_F1 || uni == 'h') gotoHelp(help);
else if(uni == 'v') popScreen();
else if(uni == ' ') popScreen();
else if(sym == SDLK_ESCAPE) popScreen();
#if CAP_CONFIG
else if(uni == 's') saveConfig();
@@ -648,6 +648,8 @@ void showGraphConfig() {
char xuni = uni | 96;
if(uni >= 32 && uni < 64) xuni = uni;
if(xuni == 'u') vid.particles = !vid.particles;
if(xuni == 'd') vid.graphglyph = (1+vid.graphglyph)%3;
@@ -905,12 +907,13 @@ void showJoyConfig() {
dialog::addSelItem(XLAT("second joystick: pan threshold"), its(vid.joypanthreshold), 'c');
dialog::addSelItem(XLAT("second joystick: panning speed"), fts(vid.joypanspeed * 1000), 'd');
dialog::addItem(XLAT("back"), 'v');
dialog::addBreak(50);
dialog::addItem(XLAT("go back"), ' ');
dialog::display();
keyhandler = [] (int sym, int uni) {
dialog::handleNavigation(sym, uni);
char xuni = uni | 96;
char xuni = uni | 32;
if(xuni == 'p') autojoy = !autojoy;
else if(xuni == 'a')
dialog::editNumber(vid.joyvalue, 0, 32768, 100, 4800, XLAT("first joystick: movement threshold"), "");
@@ -1143,7 +1146,7 @@ void show3D() {
dialog::addInfo(XLAT("parameters set correctly"));
dialog::addBreak(50);
dialog::addItem(XLAT("stereo vision config"), 'e');
dialog::addItem(XLAT("exit 3D configuration"), 'v');
dialog::addItem(XLAT("go back"), ' ');
dialog::display();
keyhandler = [] (int sym, int uni) {
@@ -1232,7 +1235,7 @@ void showCustomizeChar() {
if(numplayers() > 1) dialog::addSelItem(XLAT("player"), its(shmup::cpid+1), 'a');
dialog::addBreak(50);
dialog::addItem(XLAT("return to the game"), 'v');
dialog::addItem(XLAT("go back"), ' ');
dialog::display();
int firsty = dialog::items[0].position / 2;
@@ -1247,7 +1250,7 @@ void showCustomizeChar() {
keyhandler = [] (int sym, int uni) {
dialog::handleNavigation(sym, uni);
char xuni = uni | 96;
char xuni = uni | 32;
if(shmup::on || multi::players) shmup::cpid = shmup::cpid_edit % shmup::players;
charstyle& cs = getcs();
@@ -1265,7 +1268,7 @@ void showCustomizeChar() {
if(xuni == 'd') switchcolor(cs.dresscolor, cat ? haircolors : dresscolors);
if(xuni == 'f') switchcolor(cs.dresscolor2, dresscolors2);
if(xuni == 'u') switchcolor(cs.uicolor, eyecolors);
if(xuni == 'v' || sym == SDLK_ESCAPE) popScreen();
if(uni == ' ' || sym == SDLK_ESCAPE) popScreen();
};
}
@@ -1317,7 +1320,7 @@ void selectLanguageScreen() {
dialog::addBreak(50);
vid.language = -1;
dialog::addBoolItem(XLAT("default") + ": " + XLAT("EN"), v == -1, '0');
dialog::addItem(XLAT("exit configuration"), '1');
dialog::addItem(XLAT("go back"), ' ');
dialog::addBreak(50);
@@ -1344,7 +1347,7 @@ void selectLanguageScreen() {
keyhandler = [] (int sym, int uni) {
dialog::handleNavigation(sym, uni);
char xuni = uni | 96;
char xuni = uni | 32;
if(uni == '0') {
vid.language = -1;
ANDROID_SETTINGS;