rogueviz:: more cleanup

rogueviz/rogueviz.cpp

@@ -1277,8 +1277,10 @@ void showVertexSearch() {
 
 purehookset hooks_rvmenu;
 
+hookset<bool()> *hooks_rvmenu_replace;
+
 void showMenu() {
-  if(staircase::on) { staircase::showMenu(); return; }
+  if(callhandlers(false, hooks_rvmenu_replace)) return;
   cmode = sm::SIDE | sm::MAYDARK | sm::DIALOG_STRICT_X;
   gamescreen(0);  
 

rogueviz/rogueviz.h

@@ -93,24 +93,6 @@ namespace rogueviz {
     void clear();
     }
   
-  namespace staircase {
-    extern bool on;
-    void showMenu();
-    void make_staircase();
-    }
-  
-  namespace banachtarski {
-    extern bool on;
-    void init_bantar();
-    void bantar_anim();    
-    extern bool bmap;
-    extern void init_bantar_map();
-    }
-  
-  namespace pentagonal {
-    void run_snub(int v, int w);
-    }
-
   extern colorpair dftcolor;
   namespace collatz { 
     extern double s2, s3, p2, p3; 
@@ -131,6 +113,7 @@ namespace rogueviz {
   
   namespace rvtour {
     using namespace hr::tour;
+    extern hookset<void(vector<slide>&)> *hooks_build_rvtour;
     slide *gen_rvtour();
     }
 

rogueviz/staircase.cpp

@@ -347,6 +347,10 @@ int readArgs() {
 
 int phooks = addHook(hooks_args, 100, readArgs)
   + addHook(hooks_fixticks, 100, check)
+  + addHook(hooks_rvmenu_replace, 100, [] {
+     if(staircase::on) { staircase::showMenu(); return true; }
+     return false;
+     })
   + addHook(rvtour::hooks_build_rvtour, 100, [] (vector<tour::slide>& v) {
     using namespace tour;
     v.push_back(