From c7f93c30549e7e6d23e6eeeef71fca1cf65631ae Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 3 Feb 2018 13:54:51 +0100
Subject: [PATCH] more work on enabling Rug in mobile

---
 init.cpp        |  2 +-
 language-cz.cpp |  4 ++--
 language-pl.cpp |  4 ++--
 language-ru.cpp |  5 +++--
 rug.cpp         | 11 +++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/init.cpp b/init.cpp
index a157090e..9d58ba47 100644
--- a/init.cpp
+++ b/init.cpp
@@ -114,7 +114,7 @@
 #endif
 
 #ifndef CAP_RUG
-#define CAP_RUG (!ISMOBWEB && !ISMINI && CAP_SDL && CAP_GL)
+#define CAP_RUG (!ISMINI && CAP_GL)
 #endif
 
 #ifndef CAP_EDIT
diff --git a/language-cz.cpp b/language-cz.cpp
index 1fac9a09..a6984ac3 100644
--- a/language-cz.cpp
+++ b/language-cz.cpp
@@ -5195,7 +5195,7 @@ S("The game starts in the Icy Lands. Collect the Ice Diamonds "
 S("Hypersian Rug model", "Model hyperského koberce")
 S(
   "New players think that the action of HyperRogue takes place on a sphere. "
-#if ISMOBWEB
+#if NORUG
   "This is not true -- try the Tutorial in the native desktop version shows "
   "the surface HyperRogue actually takes place on.",
 #else
@@ -5207,7 +5207,7 @@ S(
   
 
   "Noví hráči si často myslí, že se HyperRogue odehrává na povrchu koule. "
-#if ISMOBWEB
+#if NORUG
   "Není to pravda -- Tutoriál v desktopové verzi ti může ukázat povrch, "
   "na jakém se HyperRogue opravdu odehrává."
 #else
diff --git a/language-pl.cpp b/language-pl.cpp
index e3c0d4b5..04c48196 100644
--- a/language-pl.cpp
+++ b/language-pl.cpp
@@ -5136,7 +5136,7 @@ S("The game starts in the Icy Lands. Collect the Ice Diamonds "
 S("Hypersian Rug model", "Model Hiperskiego Dywanu")
 S(
   "New players think that the action of HyperRogue takes place on a sphere. "
-#if ISMOBWEB
+#if NORUG
   "This is not true -- the Tutorial in the native desktop version shows "
   "the surface HyperRogue actually takes place on.",
 #else
@@ -5148,7 +5148,7 @@ S(
   
 
   "Nowi gracze myślą, że akcja HyperRogue toczy się na sferze. "
-#if ISMOBWEB
+#if NORUG
   "To nieprawda -- Podręcznik w komputerowej wersji wykonywalnej "
   "pokazuje powierzchnię, na której w rzeczywistości toczy się rozgrywka."
 #else
diff --git a/language-ru.cpp b/language-ru.cpp
index 0c1ed861..feb0c581 100644
--- a/language-ru.cpp
+++ b/language-ru.cpp
@@ -1,3 +1,4 @@
+
 // HyperRogue Russian translation, by green orange <khadaev98@gmail.com>
 // Copyright (C) 2011-2016 Zeno Rogue, see 'hyper.cpp' for details
 
@@ -5290,7 +5291,7 @@ S("The game starts in the Icy Lands. Collect the Ice Diamonds "
 S("Hypersian Rug model", "Модель Гиперсидского ковра")
 S(
   "New players think that the action of HyperRogue takes place on a sphere. "
-#if ISMOBWEB
+#if NORUG
   "This is not true -- the Tutorial in the native desktop version shows "
   "the surface HyperRogue actually takes place on.",
 #else
@@ -5301,7 +5302,7 @@ S(
 #endif
  
   "Новички иногда думают, что действие в HyperRogue происходит на сфере. "
-#if ISMOBWEB
+#if NORUG
   "Это неправда -- Руководство в компьютерной версии покажет тебе "
   "настоящую поверхность HyperRogue."
 #else
diff --git a/rug.cpp b/rug.cpp
index ebabdae6..c5ede86d 100644
--- a/rug.cpp
+++ b/rug.cpp
@@ -1470,7 +1470,11 @@ void show() {
   dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u');
   
   dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o');
+  #if CAP_SDL
   dialog::addBoolItem(XLAT("render texture without OpenGL"), (rendernogl), 'g');
+  #else
+  rendernogl = false;
+  #endif
   dialog::addSelItem(XLAT("texture size"), its(texturesize)+"x"+its(texturesize), 's');
 
   dialog::addSelItem(XLAT("vertex limit"), its(vertex_limit), 'v');
@@ -1498,9 +1502,6 @@ void show() {
 
   dialog::display();
   keyhandler = [] (int sym, int uni) {
-  #if ISPANDORA
-    rendernogl = true;
-  #endif
     dialog::handleNavigation(sym, uni);
 
     if(uni == 'h') gotoHelp(
@@ -1589,10 +1590,8 @@ void show() {
       pushScreen(showStereo);
     else if(uni == 'n' && !rug::rugged)
       gwhere = eGeometry((gwhere+1) % 4);
-  #if !ISPANDORA
-    else if(uni == 'g' && !rug::rugged)
+    else if(uni == 'g' && !rug::rugged && CAP_SDL)
       rendernogl = !rendernogl;
-  #endif
     else if(uni == 's' && !rug::rugged) {
       texturesize *= 2;
       if(texturesize == 8192) texturesize = 64;