From 3f213cfbe072fca77275414c7c0116cc6c381bc0 Mon Sep 17 00:00:00 2001 From: Minjae Song Date: Mon, 4 Mar 2019 04:55:12 +0900 Subject: [PATCH] requesting xinput will always fail on non-windows --- gradlew | 0 src/net/torvald/terrarum/AppLoader.java | 7 ++++++- src/net/torvald/terrarum/TitleScreen.kt | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/net/torvald/terrarum/AppLoader.java b/src/net/torvald/terrarum/AppLoader.java index 892d0bb4c..0f233bd15 100644 --- a/src/net/torvald/terrarum/AppLoader.java +++ b/src/net/torvald/terrarum/AppLoader.java @@ -335,7 +335,12 @@ public class AppLoader implements ApplicationListener { } // nullify if not actually connected - if (!((XinputControllerAdapter) gamepad).getC().isConnected()) { + try { + if (!((XinputControllerAdapter) gamepad).getC().isConnected()) { + gamepad = null; + } + } + catch (NullPointerException notQuiteWindows) { gamepad = null; } } diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index f7c23ccd6..ece697eeb 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -220,7 +220,7 @@ class TitleScreen(val batch: SpriteBatch) : Screen { // render? just do it anyway AppLoader.measureDebugTime("Ingame.render") { renderScreen() } AppLoader.setDebugTime("Ingame.render-Light", - (AppLoader.debugTimers["Ingame.render"] as Long) - ((AppLoader.debugTimers["Renderer.LightTotal"] as? Long) ?: 0) + ((AppLoader.debugTimers["Ingame.render"] as? Long) ?: 0) - ((AppLoader.debugTimers["Renderer.LightTotal"] as? Long) ?: 0) ) }