mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

fixes for mobile

Browse Source
This commit is contained in:
Zeno Rogue 2019-02-08 16:52:44 +01:00
parent 13c60727cd
commit f546bba84a
6 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conformal.cpp
View File

@ -669,6 +669,7 @@ namespace conformal {
dialog::init(XLAT("models of hyperbolic geometry")); dialog::init(XLAT("models of hyperbolic geometry"));
for(int i=0; i<mdGUARD; i++) { for(int i=0; i<mdGUARD; i++) {
eModel m = eModel(i); eModel m = eModel(i);
if(m == mdFormula && ISMOBILE) continue;
if(model_available(m)) { if(model_available(m)) {
dialog::addBoolItem(get_model_name(m), pmodel == m, "0123456789!@#$%^&*()" [m]); dialog::addBoolItem(get_model_name(m), pmodel == m, "0123456789!@#$%^&*()" [m]);
dialog::add_action([m] () { dialog::add_action([m] () {

3
geom-exp.cpp
View File

@ -625,8 +625,11 @@ void showEuclideanMenu() {
dialog::addBreak(50); dialog::addBreak(50);
#if CAP_SHOT
dialog::addItem(XLAT("take picture"), 's'); dialog::addItem(XLAT("take picture"), 's');
dialog::add_action([] { pushScreen(shot::menu); }); dialog::add_action([] { pushScreen(shot::menu); });
#endif
dialog::addHelp(); dialog::addHelp();
dialog::addBack(); dialog::addBack();

6
hyper.h
View File

@ -7,7 +7,9 @@
#define VERNUM_HEX 0xA505 #define VERNUM_HEX 0xA505
#include <stdarg.h> #include <stdarg.h>
#if !ISSTEAM
#include "hyper_function.h" #include "hyper_function.h"
#endif
namespace hr { namespace hr {
@ -16,7 +18,11 @@ void ignore(T&&) {
// placate GCC's overzealous -Wunused-result // placate GCC's overzealous -Wunused-result
} }
#if USE_STDFUNCTION
using std::function;
#else
template<class Sig> using function = hyper_function<Sig>; template<class Sig> using function = hyper_function<Sig>;
#endif
// functions and types used from the standard library // functions and types used from the standard library
using std::vector; using std::vector;

3
pattern2.cpp
View File

@ -1495,7 +1495,8 @@ namespace patterns {
dialog::addSelItem(XLAT("sides"), "sides", 'B'); dialog::addSelItem(XLAT("sides"), "sides", 'B');
dialog::addSelItem(XLAT("formula"), "formula", 'f'); if(!ISMOBILE)
dialog::addSelItem(XLAT("formula"), "formula", 'f');
dialog::addBreak(100); dialog::addBreak(100);
dialog::addBoolItem(XLATN(winf[waInvisibleFloor].name), canvas_invisible, 'i'); dialog::addBoolItem(XLATN(winf[waInvisibleFloor].name), canvas_invisible, 'i');

4
polygons.cpp
View File

@ -767,10 +767,14 @@ void fixMercator(bool tinf) {
unsigned char& part(color_t& col, int i) { unsigned char& part(color_t& col, int i) {
unsigned char* c = (unsigned char*) &col; unsigned char* c = (unsigned char*) &col;
#if ISMOBILE
return c[i];
#else
#if SDL_BYTEORDER == SDL_BIG_ENDIAN #if SDL_BYTEORDER == SDL_BIG_ENDIAN
return c[sizeof(col) - 1 - i]; return c[sizeof(col) - 1 - i];
#else #else
return c[i]; return c[i];
#endif
#endif #endif
} }

4
sysconfig.h
View File

@ -17,6 +17,10 @@
#define NOLICENSE #define NOLICENSE
#endif #endif
#ifndef USE_STDFUNCTION
#define USE_STDFUNCTION ISSTEAM
#endif
#ifndef CAP_SHADER #ifndef CAP_SHADER
#define CAP_SHADER CAP_GL #define CAP_SHADER CAP_GL
#endif #endif