1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00

more work on enabling Rug in mobile

This commit is contained in:
Zeno Rogue 2018-02-03 13:54:51 +01:00
parent dcc3e11287
commit c7f93c3054
5 changed files with 13 additions and 13 deletions

View File

@ -114,7 +114,7 @@
#endif #endif
#ifndef CAP_RUG #ifndef CAP_RUG
#define CAP_RUG (!ISMOBWEB && !ISMINI && CAP_SDL && CAP_GL) #define CAP_RUG (!ISMINI && CAP_GL)
#endif #endif
#ifndef CAP_EDIT #ifndef CAP_EDIT

View File

@ -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("Hypersian Rug model", "Model hyperského koberce")
S( S(
"New players think that the action of HyperRogue takes place on a sphere. " "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 " "This is not true -- try the Tutorial in the native desktop version shows "
"the surface HyperRogue actually takes place on.", "the surface HyperRogue actually takes place on.",
#else #else
@ -5207,7 +5207,7 @@ S(
"Noví hráči si často myslí, že se HyperRogue odehrává na povrchu koule. " "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, " "Není to pravda -- Tutoriál v desktopové verzi ti může ukázat povrch, "
"na jakém se HyperRogue opravdu odehrává." "na jakém se HyperRogue opravdu odehrává."
#else #else

View File

@ -5136,7 +5136,7 @@ S("The game starts in the Icy Lands. Collect the Ice Diamonds "
S("Hypersian Rug model", "Model Hiperskiego Dywanu") S("Hypersian Rug model", "Model Hiperskiego Dywanu")
S( S(
"New players think that the action of HyperRogue takes place on a sphere. " "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 " "This is not true -- the Tutorial in the native desktop version shows "
"the surface HyperRogue actually takes place on.", "the surface HyperRogue actually takes place on.",
#else #else
@ -5148,7 +5148,7 @@ S(
"Nowi gracze myślą, że akcja HyperRogue toczy się na sferze. " "Nowi gracze myślą, że akcja HyperRogue toczy się na sferze. "
#if ISMOBWEB #if NORUG
"To nieprawda -- Podręcznik w komputerowej wersji wykonywalnej " "To nieprawda -- Podręcznik w komputerowej wersji wykonywalnej "
"pokazuje powierzchnię, na której w rzeczywistości toczy się rozgrywka." "pokazuje powierzchnię, na której w rzeczywistości toczy się rozgrywka."
#else #else

View File

@ -1,3 +1,4 @@
// HyperRogue Russian translation, by green orange <khadaev98@gmail.com> // HyperRogue Russian translation, by green orange <khadaev98@gmail.com>
// Copyright (C) 2011-2016 Zeno Rogue, see 'hyper.cpp' for details // 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("Hypersian Rug model", "Модель Гиперсидского ковра")
S( S(
"New players think that the action of HyperRogue takes place on a sphere. " "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 " "This is not true -- the Tutorial in the native desktop version shows "
"the surface HyperRogue actually takes place on.", "the surface HyperRogue actually takes place on.",
#else #else
@ -5301,7 +5302,7 @@ S(
#endif #endif
"Новички иногда думают, что действие в HyperRogue происходит на сфере. " "Новички иногда думают, что действие в HyperRogue происходит на сфере. "
#if ISMOBWEB #if NORUG
"Это неправда -- Руководство в компьютерной версии покажет тебе " "Это неправда -- Руководство в компьютерной версии покажет тебе "
"настоящую поверхность HyperRogue." "настоящую поверхность HyperRogue."
#else #else

11
rug.cpp
View File

@ -1470,7 +1470,11 @@ void show() {
dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u'); dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u');
dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o'); dialog::addBoolItem(XLAT("render the texture only once"), (renderonce), 'o');
#if CAP_SDL
dialog::addBoolItem(XLAT("render texture without OpenGL"), (rendernogl), 'g'); 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("texture size"), its(texturesize)+"x"+its(texturesize), 's');
dialog::addSelItem(XLAT("vertex limit"), its(vertex_limit), 'v'); dialog::addSelItem(XLAT("vertex limit"), its(vertex_limit), 'v');
@ -1498,9 +1502,6 @@ void show() {
dialog::display(); dialog::display();
keyhandler = [] (int sym, int uni) { keyhandler = [] (int sym, int uni) {
#if ISPANDORA
rendernogl = true;
#endif
dialog::handleNavigation(sym, uni); dialog::handleNavigation(sym, uni);
if(uni == 'h') gotoHelp( if(uni == 'h') gotoHelp(
@ -1589,10 +1590,8 @@ void show() {
pushScreen(showStereo); pushScreen(showStereo);
else if(uni == 'n' && !rug::rugged) else if(uni == 'n' && !rug::rugged)
gwhere = eGeometry((gwhere+1) % 4); gwhere = eGeometry((gwhere+1) % 4);
#if !ISPANDORA else if(uni == 'g' && !rug::rugged && CAP_SDL)
else if(uni == 'g' && !rug::rugged)
rendernogl = !rendernogl; rendernogl = !rendernogl;
#endif
else if(uni == 's' && !rug::rugged) { else if(uni == 's' && !rug::rugged) {
texturesize *= 2; texturesize *= 2;
if(texturesize == 8192) texturesize = 64; if(texturesize == 8192) texturesize = 64;