diff --git a/hyper.rc b/hyper.rc index 0c2fe35e..ba80388e 100644 --- a/hyper.rc +++ b/hyper.rc @@ -1,8 +1,8 @@ id ICON "hr-icon.ico" 1 VERSIONINFO -FILEVERSION 9,4,0,13 -PRODUCTVERSION 9,4,0,13 +FILEVERSION 10,0,0,3 +PRODUCTVERSION 10,0,0,3 BEGIN BLOCK "StringFileInfo" BEGIN @@ -10,12 +10,12 @@ BEGIN BEGIN VALUE "CompanyName", "Zeno Rogue" VALUE "FileDescription", "A roguelike in non-euclidean space" - VALUE "FileVersion", "A10.0" + VALUE "FileVersion", "A10.0b" VALUE "InternalName", "hyper" VALUE "LegalCopyright", "Zeno Rogue" VALUE "OriginalFilename", "hyper.exe" VALUE "ProductName", "HyperRogue" - VALUE "ProductVersion", "10.0" + VALUE "ProductVersion", "10.0c" END END diff --git a/hyperroid/app/src/main/jni/hyper.cpp b/hyperroid/app/src/main/jni/hyper.cpp index a352c6af..4e926eae 100644 --- a/hyperroid/app/src/main/jni/hyper.cpp +++ b/hyperroid/app/src/main/jni/hyper.cpp @@ -15,18 +15,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -#define MOBILE -#define ISMOBILE 1 #define ISANDROID 1 -#define ISIOS 0 #define GL_ES -#ifndef ANDROID -#define ANDROID -#endif - -#define ANDROIDSHARE - #define MOBPAR_FORMAL JNIEnv *env, jobject thiz #define MOBPAR_ACTUAL env, thiz @@ -80,9 +71,9 @@ Java_com_roguetemple_hyperroid_HyperRogue_loadMap extern "C" bool Java_com_roguetemple_hyperroid_HyperRogue_captureBack ( MOBPAR_FORMAL) { - if(cmode == emNormal || cmode == emQuit) - return false; - cmode = emNormal; return true; + if(cmode & sm::NORMAL) return false; + popScreenAll(); + return true; } void uploadAll(MOBPAR_FORMAL); @@ -233,9 +224,8 @@ extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_drawScreenshot(MOBPAR_ } extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_handleKey(MOBPAR_FORMAL, jint keycode) { - extra ex; flashMessages(); mousing = false; - handlekey(keycode, keycode, ex); + handlekey(keycode, keycode); } extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_update diff --git a/language-cz.cpp b/language-cz.cpp index 9770faec..f3a541cb 100644 --- a/language-cz.cpp +++ b/language-cz.cpp @@ -5870,3 +5870,10 @@ S( "zkoumat.") S("puzzles and exploration", "hádanky a zkoumání") + +S("Zebra quotient", "kvocient Zebra") +S("cheats", "cheaty") +S("field quotient", "tělesový kvocient") +S("help for keyboard user", "pomoc pro uživatele klávesnice") +S("mark heptagons", "označit sedmiúhelníky") + diff --git a/language-pl.cpp b/language-pl.cpp index 95c297de..0c4a154a 100644 --- a/language-pl.cpp +++ b/language-pl.cpp @@ -5780,5 +5780,9 @@ S( S("puzzles and exploration", "hádanky a zkoumání") +S("cheats", "oszustwa") +S("help for keyboard user", "pomoc dla użytkowników klawiatury") +S("mark heptagons", "oznacz siedmiokąty") + #undef Orb