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

more uniformization of add/back, 'space' in grapheditor works in autocheat, fixed missing XLAT in surface

Browse Source
This commit is contained in:
Zeno Rogue 2018-06-13 00:11:26 +02:00
parent 3881a7dd97
commit 28a4768ea4
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conformal.cpp
View File

@ -646,7 +646,7 @@ namespace conformal {
#if CAP_RUG #if CAP_RUG
dialog::addItem(XLAT("hypersian rug mode"), 'u'); dialog::addItem(XLAT("hypersian rug mode"), 'u');
#endif #endif
dialog::addItem(XLAT("exit this menu"), 'q'); dialog::addBack();
dialog::display(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {

2
mapeditor.cpp
View File

@ -1431,7 +1431,7 @@ namespace mapeditor {
if(uni == 'd' || uni == 'l' || uni == 'c') if(uni == 'd' || uni == 'l' || uni == 'c')
mousekey = uni; mousekey = uni;
if(uni == ' ' && cheater) { if(uni == ' ' && (cheater || autocheat)) {
popScreen(); popScreen();
pushScreen(showMapEditor); pushScreen(showMapEditor);
} }

1
pattern2.cpp
View File

@ -1632,6 +1632,7 @@ namespace patterns {
} }
else dialog::addBreak(100); else dialog::addBreak(100);
dialog::addItem(XLAT("more tuning"), 'r'); dialog::addItem(XLAT("more tuning"), 'r');
dialog::addBack();
dialog::display(); dialog::display();
keyhandler = [have_goldberg] (int sym, int uni) { keyhandler = [have_goldberg] (int sym, int uni) {

9
rug.cpp
View File

@ -1702,9 +1702,6 @@ void show() {
gamescreen(0); gamescreen(0);
dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100); dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100);
dialog::addItem(XLAT("what's this?"), 'h');
dialog::addBack();
dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u'); dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u');
dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o'); dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o');
@ -1748,11 +1745,15 @@ void show() {
} }
#endif #endif
dialog::addBreak(50);
dialog::addHelp();
dialog::addBack();
dialog::display(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {
dialog::handleNavigation(sym, uni); dialog::handleNavigation(sym, uni);
if(uni == 'h') gotoHelp(makehelp()); if(uni == 'h' || uni == SDLK_F1) gotoHelp(makehelp());
else if(uni == 'u') { else if(uni == 'u') {
if(rug::rugged) rug::close(); if(rug::rugged) rug::close();
else { else {

11
surface.cpp
View File

@ -687,20 +687,21 @@ void show_surfaces() {
dialog::addBreak(100); dialog::addBreak(100);
dialog::addItem(XLAT("what's this?"), 'h');
dialog::addSelItem(XLAT("precision"), its(precision), 'p'); dialog::addSelItem(XLAT("precision"), its(precision), 'p');
string cstyles[4] = { "OFF", "on surface", "on H² (static)", "on H² (dynamic)" }; string cstyles[4] = { "OFF", "on surface", "on H² (static)", "on H² (dynamic)" };
if((rug::rugged && sh && sh != dsHyperboloid && sh != dsHemisphere) || coverage_style) if((rug::rugged && sh && sh != dsHyperboloid && sh != dsHemisphere) || coverage_style)
dialog::addSelItem(XLAT("display coverage"), cstyles[coverage_style], 'c'); dialog::addSelItem(XLAT("display coverage"), cstyles[coverage_style], 'c');
else dialog::addBreak(100); else dialog::addBreak(100);
dialog::addItem(XLAT("take me back"), 'q');
dialog::addHelp();
dialog::addBack();
dialog::display(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {
dialog::handleNavigation(sym, uni); dialog::handleNavigation(sym, uni);
if(uni == 'h') if(uni == 'h' || uni == SDLK_F1)
gotoHelp( gotoHelp(XLAT(
"In this menu you can choose from several known smooth surfaces of constant negative curvature. " "In this menu you can choose from several known smooth surfaces of constant negative curvature. "
"Since the curvature of hyperbolic plane is also constant negative, these surfaces " "Since the curvature of hyperbolic plane is also constant negative, these surfaces "
"are great to draw hyperbolic tesselations on. While they look great, only a small part " "are great to draw hyperbolic tesselations on. While they look great, only a small part "
@ -708,7 +709,7 @@ void show_surfaces() {
"good for playing HyperRogue; however, the coverage extends far away in specific directions, " "good for playing HyperRogue; however, the coverage extends far away in specific directions, "
"so first increasing sight range in graphics config and texture size in hypersian rug settings may improve the effect. " "so first increasing sight range in graphics config and texture size in hypersian rug settings may improve the effect. "
"For convenience, you can also choose other 3D models from this menu." "For convenience, you can also choose other 3D models from this menu."
); ));
else if(uni == '1') else if(uni == '1')
run_shape(dsTractricoid); run_shape(dsTractricoid);