From d0dc017ce3cbaec4c47e50c211636923f55b7150 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 7 May 2018 20:09:58 +0200
Subject: [PATCH] fixed disabling CAP_RUG and CAP_TOUR

---
 config.cpp    | 2 ++
 conformal.cpp | 4 ++++
 hyper.h       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/config.cpp b/config.cpp
index 6a511d9b..aed13e6a 100644
--- a/config.cpp
+++ b/config.cpp
@@ -281,7 +281,9 @@ bool have_current_settings() {
   int modecount = 0;
   if(inv::on) modecount++;
   if(shmup::on) modecount += 10;
+#if CAP_TOUR
   if(tour::on) modecount += 10;
+#endif
   if(chaosmode) modecount += 10;
   if(nonbitrunc) modecount += 10;
   if(peace::on) modecount += 10;
diff --git a/conformal.cpp b/conformal.cpp
index 874e961b..f2ce9d09 100644
--- a/conformal.cpp
+++ b/conformal.cpp
@@ -643,7 +643,9 @@ namespace conformal {
       
     dialog::addBreak(100);
     dialog::addItem(XLAT("history mode"), 'a');
+#if CAP_RUG
     dialog::addItem(XLAT("hypersian rug mode"), 'u');
+#endif
     dialog::addItem(XLAT("exit this menu"), 'q');
     dialog::display();
     
@@ -677,8 +679,10 @@ namespace conformal {
         projectionDialog();
       else if(uni == 'b') 
         config_camera_rotation();
+#if CAP_RUG
       else if(uni == 'u')
         pushScreen(rug::show);
+#endif
       else if(uni == 'l' && pmodel == mdHalfplane)
         lower_halfplane = !lower_halfplane;
       else if(uni == 'a')
diff --git a/hyper.h b/hyper.h
index 9cd693e2..11b284a1 100644
--- a/hyper.h
+++ b/hyper.h
@@ -919,11 +919,11 @@ namespace rug {
   extern bool rug_perspective;
   
   bool handlekeys(int sym, int uni);
-#endif
 
   void addTriangle(rugpoint *t1, rugpoint *t2, rugpoint *t3, ld len = 1);
   rugpoint *addRugpoint(hyperpoint h, double dist);
   void buildRug();
+#endif
   }
 
 #define HASLINEVIEW