diff --git a/rogueviz/rogueviz-all.cpp b/rogueviz/rogueviz-all.cpp index c08226ef..fa4b3d17 100644 --- a/rogueviz/rogueviz-all.cpp +++ b/rogueviz/rogueviz-all.cpp @@ -28,7 +28,6 @@ #include "impossible-ring.cpp" #include "triangle.cpp" #include "sumotron.cpp" -#include "noniso-honeycombs.cpp" #include "random-walk.cpp" #include "fifteen.cpp" #include "crystal-sokoban.cpp" @@ -58,11 +57,14 @@ #include "playing-with-impossibility.cpp" #include "hyperbolic-minesweeper-pres.cpp" #include "dhrg-pres.cpp" +#include "noniso-honeycombs.cpp" #endif #include "highdim-demo.cpp" #include "horo63.cpp" #include "platformer.cpp" +#if CAP_RAY && MAXMDIM >= 4 #include "intra-demos.cpp" +#endif #include "gobot.cpp" #include "extra-projections.cpp" #include "balloonsim.cpp" diff --git a/rogueviz/snow.cpp b/rogueviz/snow.cpp index f903456c..09bb24c7 100644 --- a/rogueviz/snow.cpp +++ b/rogueviz/snow.cpp @@ -191,6 +191,7 @@ bool draw_snow(cell *c, const shiftmatrix& V) { string cap = "non-Euclidean snowballs/"; +#if CAP_RVSLIDES void snow_slide(vector& v, string title, string desc, reaction_t t) { using namespace tour; v.push_back( @@ -219,6 +220,7 @@ void snow_slide(vector& v, string title, string desc, reaction_t t) }} ); } +#endif void show() { cmode = sm::SIDE | sm::MAYDARK; @@ -299,6 +301,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_snow) param_b(just_centered, "snow_just_centered"); }) +#if CAP_RVSLIDES + addHook_rvslides(161, [] (string s, vector& v) { if(s != "noniso") return; v.push_back(tour::slide{ @@ -372,7 +375,9 @@ auto hchook = addHook(hooks_drawcell, 100, draw_snow) snow_lambda = 3; }); #endif - }); + }) +#endif + + 0; } } diff --git a/rogueviz/triangle.cpp b/rogueviz/triangle.cpp index 33311f60..6f905250 100644 --- a/rogueviz/triangle.cpp +++ b/rogueviz/triangle.cpp @@ -497,6 +497,7 @@ bool draw_ptriangle(cell *c, const shiftmatrix& V) { return false; } +#if CAP_RVSLIDES void slide_itri(tour::presmode mode, int id) { using namespace tour; setCanvas(mode, '0'); @@ -524,6 +525,7 @@ void slide_itri(tour::presmode mode, int id) { } rogueviz::pres::non_game_slide_scroll(mode); } +#endif string cap = "Impossible architecture in Nil/"; @@ -546,9 +548,11 @@ auto hchook = addHook(hooks_drawcell, 100, draw_ptriangle) } else return 1; return 0; - }) + }); -+ addHook_rvslides(166, [] (string s, vector& v) { +#if CAP_RVSLIDES +auto hcslides = + addHook_rvslides(166, [] (string s, vector& v) { using namespace tour; if(s != "noniso") return; @@ -585,6 +589,7 @@ auto hchook = addHook(hooks_drawcell, 100, draw_ptriangle) slide_itri(mode, 2); }}); }); +#endif } } \ No newline at end of file