From b5219ad0fea4366055ffc3d5d46ce9d49e6a6320 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 15 May 2020 12:04:29 +0200
Subject: [PATCH] moved CAP_NCONF and CAP_RVSLIDES back to rogueviz

---
 rogueviz/collatz.cpp   |  1 -
 rogueviz/janko.cpp     |  2 +-
 rogueviz/magiccube.cpp |  2 +-
 rogueviz/newconf.cpp   |  7 ++++++-
 rogueviz/rogueviz.h    |  8 ++++++++
 sysconfig.h            | 12 ------------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/rogueviz/collatz.cpp b/rogueviz/collatz.cpp
index 0a0dd396..4f5b7474 100644
--- a/rogueviz/collatz.cpp
+++ b/rogueviz/collatz.cpp
@@ -1,4 +1,3 @@
-#include "../hyper.h"
 #include "rogueviz.h"
 
 namespace rogueviz {
diff --git a/rogueviz/janko.cpp b/rogueviz/janko.cpp
index 6188f06b..7ecfcb42 100644
--- a/rogueviz/janko.cpp
+++ b/rogueviz/janko.cpp
@@ -1,6 +1,6 @@
 /* explore the Janko group J1: https://en.wikipedia.org/wiki/Janko_group_J1 */
 
-#include "../hyper.h"
+#include "rogueviz.h"
 
 #if !ISWEB
 
diff --git a/rogueviz/magiccube.cpp b/rogueviz/magiccube.cpp
index 3d5d819e..492cefe1 100644
--- a/rogueviz/magiccube.cpp
+++ b/rogueviz/magiccube.cpp
@@ -1,4 +1,4 @@
-#include "../hyper.h"
+#include "rogueviz.h"
 
 namespace rogueviz {
 
diff --git a/rogueviz/newconf.cpp b/rogueviz/newconf.cpp
index cd73cd86..2d3e13f9 100644
--- a/rogueviz/newconf.cpp
+++ b/rogueviz/newconf.cpp
@@ -2,9 +2,14 @@
 // example commandline: -noplayer -rugtsize 4096 -smart 1 -canvas B -ncee
 // set CAP_NCONF (and change the path) if you have access to newconformist
 
-#include "../hyper.h"
+#include "rogueviz.h"
 
 #if CAP_NCONF
+
+#ifndef CAP_DRAW
+#define CAP_DRAW 0
+#endif
+
 #define main nconf_main
 #undef unordered_map
 #undef self
diff --git a/rogueviz/rogueviz.h b/rogueviz/rogueviz.h
index 3cdb2ae7..c8b2b839 100644
--- a/rogueviz/rogueviz.h
+++ b/rogueviz/rogueviz.h
@@ -6,6 +6,14 @@
 
 #define RVPATH HYPERPATH "rogueviz/"
 
+#ifndef CAP_NCONF
+#define CAP_NCONF 0
+#endif
+
+#ifndef CAP_RVSLIDES
+#define CAP_RVSLIDES (CAP_TOUR && !ISWEB)
+#endif
+
 namespace rogueviz {
   using namespace hr;
   
diff --git a/sysconfig.h b/sysconfig.h
index ffbec3ab..ce4f70b3 100644
--- a/sysconfig.h
+++ b/sysconfig.h
@@ -63,14 +63,6 @@
 #define ISMINI 0
 #endif
 
-#ifndef CAP_NCONF
-#define CAP_NCONF 0
-#endif
-
-#ifndef CAP_DRAW
-#define CAP_DRAW 0
-#endif
-
 #ifndef CAP_XGD
 #define CAP_XGD (ISANDROID || ISFAKEMOBILE)
 #endif
@@ -213,10 +205,6 @@
 #define CAP_ROGUEVIZ 0
 #endif
 
-#ifndef CAP_RVSLIDES
-#define CAP_RVSLIDES (CAP_TOUR && !ISWEB)
-#endif
-
 #ifndef CAP_PROFILING
 #define CAP_PROFILING 0
 #endif