moved CAP_NCONF and CAP_RVSLIDES back to rogueviz

rogueviz/collatz.cpp

@@ -1,4 +1,3 @@
-#include "../hyper.h"
 #include "rogueviz.h"
 
 namespace rogueviz {

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
 

rogueviz/magiccube.cpp

@@ -1,4 +1,4 @@
-#include "../hyper.h"
+#include "rogueviz.h"
 
 namespace rogueviz {
 

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

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;
   

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