diff --git a/achievement.h b/achievement.h deleted file mode 100644 index e69de29b..00000000 diff --git a/graph.cpp b/graph.cpp index 1664cf36..ed6803fc 100644 --- a/graph.cpp +++ b/graph.cpp @@ -8306,7 +8306,9 @@ void handlekey(int sym, int uni, extra& ev) { else if(cmode == emOverview) handleOverview(sym, uni); else if(cmode == emPickEuclidean) handleEuclidean(sym, uni); #ifdef MOBILE +#ifdef HAVE_ACHIEVEMENTS else if(cmode == emLeader) leader::handleKey(sym, uni); +#endif #endif else if(cmode == emColor) dialog::handleColor(sym, uni); else if(cmode == emNumber) dialog::handleNumber(sym, uni); diff --git a/hydroid/app/build.gradle b/hydroid/app/build.gradle index ef6d3ffa..3e634a63 100644 --- a/hydroid/app/build.gradle +++ b/hydroid/app/build.gradle @@ -83,3 +83,15 @@ android { abortOnError false } } + +dependencies { + // + // IDE setting pulls in the specific version of v4 support you have installed: + // + //compile 'com.android.support:support-v4:21.0.3' + + // + // generic directive pulls in any available version of v4 support: + // + compile 'com.android.support:support-v4:+' +} diff --git a/hydroid/app/src/main/java/com/roguetemple/hyperroid/HyperRogue.java b/hydroid/app/src/main/java/com/roguetemple/hyperroid/HyperRogue.java index cceecb1d..75cf2ee0 100644 --- a/hydroid/app/src/main/java/com/roguetemple/hyperroid/HyperRogue.java +++ b/hydroid/app/src/main/java/com/roguetemple/hyperroid/HyperRogue.java @@ -332,7 +332,6 @@ public class HyperRogue extends Activity { fl.addView(glview, lp); } - if(running) connectGames(); } MediaPlayer backgroundmusic; diff --git a/hydroid/app/src/main/jni/hyper.cpp b/hydroid/app/src/main/jni/hyper.cpp index e5432555..b7983b2a 100644 --- a/hydroid/app/src/main/jni/hyper.cpp +++ b/hydroid/app/src/main/jni/hyper.cpp @@ -1,11 +1,5 @@ -// Hyperbolic Rogue for Android -// Copyright (C) 2012-2016 Zeno Rogue -// number of times compiled since Oct 30: LOTS+5 -// Wed Mar 8, 23:16:40 -// Wed Mar 9, 01:14:57 -// Web Mar 9, ~12:30 -// Web Mar 10, 16:43:30 -// it took 20 minutes to compile. Now it takes just 5 minutes for an unknown reason! +// HyperRogue for Android +// Copyright (C) 2012-2017 Zeno Rogue // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -43,7 +37,7 @@ const char *scorefile, *conffile; bool settingsChanged = false; -#include "/home/eryx/proj/rogue/hyper/init.cpp" +#include "../../../../../init.cpp" JNIEnv *whatever; @@ -299,6 +293,9 @@ void uploadAll(JNIEnv *env, jobject thiz) { env->DeleteLocalRef(cls); } +void achievement_init() {} +void achievement_close() {} +void achievement_gain(const char* s, char flags) {} #include diff --git a/hydroid/app/src/main/res/drawable-hdpi/icon.png b/hydroid/app/src/main/res/drawable-hdpi/icon.png index 375b8661..7e605167 100644 Binary files a/hydroid/app/src/main/res/drawable-hdpi/icon.png and b/hydroid/app/src/main/res/drawable-hdpi/icon.png differ diff --git a/hydroid/app/src/main/res/drawable-ldpi/icon.png b/hydroid/app/src/main/res/drawable-ldpi/icon.png index 7f229656..45512375 100644 Binary files a/hydroid/app/src/main/res/drawable-ldpi/icon.png and b/hydroid/app/src/main/res/drawable-ldpi/icon.png differ diff --git a/hydroid/app/src/main/res/drawable-mdpi/icon.png b/hydroid/app/src/main/res/drawable-mdpi/icon.png index 1a55585d..b2396256 100644 Binary files a/hydroid/app/src/main/res/drawable-mdpi/icon.png and b/hydroid/app/src/main/res/drawable-mdpi/icon.png differ diff --git a/hydroid/app/src/main/res/drawable-xhdpi/icon.png b/hydroid/app/src/main/res/drawable-xhdpi/icon.png index f73bb6e1..e9102198 100644 Binary files a/hydroid/app/src/main/res/drawable-xhdpi/icon.png and b/hydroid/app/src/main/res/drawable-xhdpi/icon.png differ diff --git a/hydroid/app/src/main/res/drawable-xxhdpi/icon.png b/hydroid/app/src/main/res/drawable-xxhdpi/icon.png index 61137d7a..fbeb3e80 100644 Binary files a/hydroid/app/src/main/res/drawable-xxhdpi/icon.png and b/hydroid/app/src/main/res/drawable-xxhdpi/icon.png differ diff --git a/hydroid/app/src/main/res/drawable-xxxhdpi/icon.png b/hydroid/app/src/main/res/drawable-xxxhdpi/icon.png index ffb1ec03..1f397a0f 100644 Binary files a/hydroid/app/src/main/res/drawable-xxxhdpi/icon.png and b/hydroid/app/src/main/res/drawable-xxxhdpi/icon.png differ diff --git a/hydroid/app/src/main/res/drawable/icon.png b/hydroid/app/src/main/res/drawable/icon.png index 927f4c09..9743bb70 100644 Binary files a/hydroid/app/src/main/res/drawable/icon.png and b/hydroid/app/src/main/res/drawable/icon.png differ diff --git a/init.cpp b/init.cpp index f48e6bf6..2418b292 100644 --- a/init.cpp +++ b/init.cpp @@ -534,8 +534,4 @@ void mobile_draw(MOBPAR_FORMAL) { #endif } -#ifdef MOBILE -#include "google-games.cpp" -#endif - #endif diff --git a/menus.cpp b/menus.cpp index 7b5bc088..a8b8e533 100644 --- a/menus.cpp +++ b/menus.cpp @@ -1559,8 +1559,10 @@ void displayMenus() { if(cmode == emHelp) showHelp(); if(cmode == em3D) show3D(); #ifdef MOBILE +#ifdef HAVE_ACHIEVEMENTS if(cmode == emLeader) leader::showMenu(); #endif +#endif #ifdef ROGUEVIZ if(cmode == emRogueviz) rogueviz::showMenu(); #endif