From 2e4fe5baba121c865475b019f9c315c270126b0d Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sun, 6 Aug 2017 16:17:13 +0200 Subject: [PATCH] more mobile fixes --- hyperroid/app/src/main/jni/hyper.cpp | 1 + init.cpp | 4 ++++ menus.cpp | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hyperroid/app/src/main/jni/hyper.cpp b/hyperroid/app/src/main/jni/hyper.cpp index 2574a2de..15465b57 100644 --- a/hyperroid/app/src/main/jni/hyper.cpp +++ b/hyperroid/app/src/main/jni/hyper.cpp @@ -166,6 +166,7 @@ Java_com_roguetemple_hyperroid_HyperRogue_initGame(MOBPAR_FORMAL) { if(gamerunning) return 1; gamerunning = true; initAll(); + if(showstartmenu) pushScreen(showStartMenu); uploadAll(MOBPAR_ACTUAL); return 0; } diff --git a/init.cpp b/init.cpp index aa98d8b5..d2966935 100644 --- a/init.cpp +++ b/init.cpp @@ -161,6 +161,10 @@ #define CAP_SHMUP 1 #endif +#ifndef CAP_SHMUP_GOOD +#define CAP_SHMUP (!ISMOBWEB) +#endif + #if ISMOBILE #define EXTRALICENSE "\n\nHyperRogue soundtrack by Shawn Parrotte (http://www.shawnparrotte.com), under the Creative Commons BY-SA 3.0 license, http://creativecommons.org/licenses/by-sa/3.0/" #undef XEXTRALICENSE diff --git a/menus.cpp b/menus.cpp index cd028344..6959e685 100644 --- a/menus.cpp +++ b/menus.cpp @@ -736,11 +736,11 @@ void showStartMenu() { dialog::addInfo(XLAT("use your Orbs in tough situations")); #endif -#if CAP_SHMUP +#if CAP_SHMUP_GOOD dialog::addBreak(100); dialog::addBigItem(XLAT("shoot'em up mode"), 's'); dialog::addInfo(XLAT("continuous spacetime")); -#if HAVE_ACHIEVEMENTS +#ifdef HAVE_ACHIEVEMENTS dialog::addInfo(XLAT("(most achievements are not available)")); #endif #endif