Merge pull request #1 from CleverRaven/master

Bring up to date

.gitignore

@@ -156,3 +156,6 @@ stage
 
 # Apple Xcode IDE
 Xcode/
+
+# gdb
+.gdb_history

CMakeLists.txt

@@ -45,7 +45,7 @@ if (NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)
     string(REPLACE "-NOTFOUND" "" GIT_VERSION ${GIT_VERSION})
     FILE(WRITE ${CMAKE_SOURCE_DIR}/src/version.h "\#define VERSION \"${GIT_VERSION}\"\n")
     MESSAGE(STATUS "${PROJECT_NAME} build version is : ${GIT_VERSION}\n")
-    ADD_DEFINITIONS(-DGIT_VERSION=${GIT_VERSION})
+    ADD_DEFINITIONS(-DGIT_VERSION)
 ELSE (NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)
     MESSAGE("")
 ENDIF(NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)

COMPILING.md

@@ -299,7 +299,7 @@ The Gradle project lives in the repository under `android/`. You can build it vi
   * libintl-lite (tested with a custom fork of libintl-lite 0.5)
   * lua (tested with lua 5.1.5)
 
-Some dependencies need their entire source code copied under the Android project folder so they can be built for Android - see below.
+The Gradle build process automatically installs dependencies from [deps.zip](android/app/deps.zip).
 
 ### Setup
 
@@ -325,23 +325,6 @@ Export Android environment variables (you can add these to the end of `~/.bashrc
     export PATH=$PATH:$ANDROID_SDK_ROOT/tools
     export PATH=$PATH:$ANDROID_NDK_ROOT
 
-Install custom Android dependencies. Change directory to `Cataclysm-DDA` (the root folder of this repository) and run:
-
-    git clone https://github.com/a1studmuffin/SDL2 ./android/app/jni/SDL2
-    git clone https://github.com/a1studmuffin/lua ./android/app/jni/lua
-    git clone https://github.com/a1studmuffin/libintl-lite ./android/app/jni/libintl-lite
-
-Install other Android dependencies SDL2_ttf, SDL2_mixer and SDL2_image. You may download the release ZIPs from from https://hg.libsdl.org/ and install them manually under `./android/app/jni/SDL2_xxx`, or clone latest dev with hg:
-
-    hg clone http://hg.libsdl.org/SDL_ttf ./android/app/jni/SDL2_ttf
-    hg clone http://hg.libsdl.org/SDL_mixer ./android/app/jni/SDL2_mixer
-    hg clone http://hg.libsdl.org/SDL_image ./android/app/jni/SDL2_image
-
-Manually generate version and lua bindings:
-
-    make version
-    cd src/lua && lua generate_bindings.lua
-
 ### Android device setup
 
 Enable [Developer options on your Android device](https://developer.android.com/studio/debug/dev-options). Connect your device to your PC via USB cable and run:
@@ -675,7 +658,7 @@ Note: You may need to bash the close button repeatedly. Or use the task manager
 
 #### 4. Open an editor that preserves line-endings
 
-Note: Wordpad should do. Or Notepadd++.
+Note: Wordpad should do. Or Notepad++.
 
 #### 5. Open `C:\msys64\etc\pacman.conf` and change:
 

Makefile

@@ -1037,6 +1037,7 @@ endif
 
 astyle-check:
 ifdef ASTYLE_CHECK
+	$(info $(ASTYLE_BINARY) -V: $(shell $(ASTYLE_BINARY) -V))
 	@if [ "$(findstring Formatted,$(ASTYLE_CHECK))" = "" ]; then echo "no astyle regressions";\
         else printf "astyle regressions found.\n$(ASTYLE_CHECK)\n" && false; fi
 else

README.md

@@ -20,7 +20,7 @@ Please read [COMPILING.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/mas
 
 ## Contribute
 
-Cataclysm:Dark Days Ahead is the result of contributions from over 600 volunteers under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+Cataclysm:Dark Days Ahead is the result of contributions from over 700 volunteers under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details.
 Some code distributed with the project is not part of the project and is released under different software licenses, the files covered by different software licenses have their own license notices.
 
 [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=146201)](https://www.bountysource.com/trackers/146201-clever-raven-cataclysm-dda?utm_source=146201&utm_medium=shield&utm_campaign=TRACKER_BADGE)
@@ -39,7 +39,7 @@ GitHub repo:
 https://github.com/CleverRaven/Cataclysm-DDA
 
 IRC:
-irc.freenode.net ; #CataclysmDDA
+`irc.freenode.net` ; `#CataclysmDDA`
 http://webchat.freenode.net/?channels=#CataclysmDDA
 
 ## Frequently Asked Questions

android/app/src/main/java/com/cleverraven/cataclysmdda/CataclysmDDA.java

@@ -38,6 +38,10 @@ private boolean isHardwareKeyboardAvailable() {
         return getResources().getConfiguration().keyboard == Configuration.KEYBOARD_QWERTY;
     }
 
+    private float getDisplayDensity() {
+        return getResources().getDisplayMetrics().density;
+    }
+
     public void show_sdl_surface() {
         try {
             runOnUiThread(new Runnable() {

android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java

@@ -28,8 +28,8 @@ public class SplashScreen extends Activity {
     private static final int INSTALL_DIALOG_ID = 0;
     private ProgressDialog installDialog;
 
-    public CharSequence[] mSettingsNames = { "Use tiles", "Software rendering" };
-    public boolean[] mSettingsValues = { true, true };
+    public CharSequence[] mSettingsNames = { "Software rendering" };
+    public boolean[] mSettingsValues = { true };
 
     private String getVersionName() {
         try {