1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00

3d menu:: no more incorrect errors; change camera position right away in 2d3d

This commit is contained in:
Zeno Rogue 2019-05-09 17:04:37 +02:00
parent d1846f9325
commit 80ce15ded9

View File

@ -1292,9 +1292,9 @@ void show3D() {
else if(rug::rugged && !rug::spatial_rug) else if(rug::rugged && !rug::spatial_rug)
dialog::addBreak(100); dialog::addBreak(100);
#endif #endif
else if(non_spatial_model()) else if(GDIM == 2 && non_spatial_model())
dialog::addInfo(XLAT("no 3D effects available in this projection"), 0xC00000); dialog::addInfo(XLAT("no 3D effects available in this projection"), 0xC00000);
else if(!spatial_graphics) else if(GDIM == 2 && !spatial_graphics)
dialog::addInfo(XLAT("set 3D monsters or walls in basic config first")); dialog::addInfo(XLAT("set 3D monsters or walls in basic config first"));
else if(invalid != "") else if(invalid != "")
dialog::addInfo(XLAT("error: "+invalid), 0xC00000); dialog::addInfo(XLAT("error: "+invalid), 0xC00000);
@ -1326,7 +1326,7 @@ void show3D() {
else if(uni == 'c' && WDIM == 2) else if(uni == 'c' && WDIM == 2)
tc_camera = ticks, tc_camera = ticks,
dialog::editNumber(geom3::camera, 0, 5, .1, 1, XLAT("Camera level above the plane"), ""), dialog::editNumber(geom3::camera, 0, 5, .1, 1, XLAT("Camera level above the plane"), ""),
dialog::reaction = delayed_geo_reset, dialog::reaction = [] { if(GDIM == 2) need_reset_geometry = true; },
dialog::extra_options = [] { dialog::extra_options = [] {
dialog::addHelp(XLAT( dialog::addHelp(XLAT(
"Camera is placed %1 absolute units above a plane P in a three-dimensional " "Camera is placed %1 absolute units above a plane P in a three-dimensional "