miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenTTD JGR: updated build files

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-09-03 21:20:27 +03:00
parent 8cc60c9d4b
commit f2074457a4
8 changed files with 65 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
project/jni/application/openttd-jgrpp/java.patch
View File

@@ -1,20 +1,27 @@
diff --git a/project/java/Settings.java b/project/java/Settings.java
index 9e6150a41..77e84dce4 100644
index 4467879a0..1de0689c2 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -521,6 +521,15 @@ public class Settings
for( String sdpath: SdcardAppPath.get().allPaths(p) )
deleteRecursivelyAndLog(new File(sdpath + "/" + path ));
}
+ // Hack to save old config file, which is gettign corrupted on app update
+ try {
+ String cmd = "cp " + Globals.DataDir + "/.openttd/openttd.cfg " + Globals.DataDir + "/.openttd/openttd-backup.cfg";
+ Log.i("SDL", "===============");
+ Log.i("SDL", cmd);
+ int ret = Runtime.getRuntime().exec(cmd).waitFor();
+ Log.i("SDL", "Status: " + String.valueOf(ret));
+ Log.i("SDL", "===============");
+ } catch (Exception e) { }
}
public static void DeleteSdlConfigOnUpgradeAndRestart(final MainActivity p)
{
@@ -532,6 +532,9 @@ public class Settings
} catch ( IOException e ) { }
new File( p.getFilesDir() + "/" + SettingsFileName ).delete();
+ // Kill it with vengeance and unload all shared libraries
+ android.os.Process.killProcess(android.os.Process.myPid());
+
Intent intent = new Intent(p, RestartMainActivity.class);
p.startActivity(intent);
System.exit(0);
diff --git a/project/java/Globals.java b/project/java/Globals.java
index 8c7017d8a..9ba3a16f7 100644
--- a/project/java/Globals.java
+++ b/project/java/Globals.java
@@ -119,7 +119,7 @@ class Globals
public static int MoveMouseWithGyroscopeSpeed = 2;
public static boolean ClickMouseWithDpad = false;
public static boolean RelativeMouseMovement = ForceRelativeMouseMode; // Laptop touchpad mode
- public static boolean ForceHardwareMouse = false;
+ public static boolean ForceHardwareMouse = true;
public static int RelativeMouseMovementSpeed = 2;
public static int RelativeMouseMovementAccel = 0;
public static int ShowScreenUnderFinger = Mouse.ZOOM_NONE;