mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Hypersian Rug forbidden when using 3D engine

This commit is contained in:
Zeno Rogue 2019-05-13 12:59:49 +02:00
parent 175c061ab4
commit 21f801d691
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conformal.cpp
View File

@ -966,7 +966,7 @@ namespace conformal {
dialog::addBreak(100);
dialog::addItem(XLAT("history mode"), 'a');
#if CAP_RUG
dialog::addItem(XLAT("hypersian rug mode"), 'u');
if(GDIM == 2) dialog::addItem(XLAT("hypersian rug mode"), 'u');
#endif
dialog::addBack();
@ -981,7 +981,7 @@ namespace conformal {
else if(uni == 'p')
projectionDialog();
#if CAP_RUG
else if(uni == 'u')
else if(uni == 'u' && DIM == 2)
pushScreen(rug::show);
#endif
else if(uni == 's') {

4
geom-exp.cpp
View File

@ -216,7 +216,7 @@ void showTorusConfig() {
dialog::addSelItem(XLAT("scale factor"), fts(vid.scale), 'z');
#if CAP_RUG
dialog::addBoolItem(XLAT("hypersian rug mode"), (rug::rugged), 'u');
if(DIM == 2) dialog::addBoolItem(XLAT("hypersian rug mode"), (rug::rugged), 'u');
#endif
dialog::addItem("activate", 'a');
@ -256,7 +256,7 @@ void showTorusConfig() {
});
else if(uni == 'z') editScale();
#if CAP_RUG
else if(uni == 'u') rug::select();
else if(uni == 'u' && DIM == 2) rug::select();
#endif
else if(doexiton(sym, uni))
popScreen();

2
geometry.cpp
View File

@ -385,6 +385,7 @@ namespace geom3 {
#if MAXMDIM >= 4
void switch_always3() {
if(rug::rugged) rug::close();
geom3::always3 = !geom3::always3;
need_reset_geometry = true;
swapmatrix(View);
@ -414,6 +415,7 @@ void switch_always3() {
void switch_fpp() {
#if MAXMDIM >= 4
if(rug::rugged) rug::close();
if(!geom3::always3) {
geom3::always3 = true;
geom3::wall_height = 1.5;