From 60db83eddb43df8dd534c7fe539b6409ac88853c Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 31 Jan 2019 13:29:40 +0900 Subject: [PATCH] making sure unused screen be disposed, and not breaking the app --- assets/locales/koKR/Polyglot-100_koKR.json | 2 +- src/net/torvald/terrarum/AppLoader.java | 1 + src/net/torvald/terrarum/LoadScreen.kt | 4 ++-- src/net/torvald/terrarum/UIItemInventoryElem.kt | 1 - src/net/torvald/terrarum/UIItemInventoryElemSimple.kt | 1 - src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/locales/koKR/Polyglot-100_koKR.json b/assets/locales/koKR/Polyglot-100_koKR.json index f448433bd..68e58d370 100644 --- a/assets/locales/koKR/Polyglot-100_koKR.json +++ b/assets/locales/koKR/Polyglot-100_koKR.json @@ -2053,7 +2053,7 @@ }, { "n": "MENU_LABEL_MAINMENU", - "s": "메뉴" + "s": "메인 메뉴" }, { "n": "MENU_LABEL_MORE", diff --git a/src/net/torvald/terrarum/AppLoader.java b/src/net/torvald/terrarum/AppLoader.java index 4e07cb2bb..a995b5df3 100644 --- a/src/net/torvald/terrarum/AppLoader.java +++ b/src/net/torvald/terrarum/AppLoader.java @@ -478,6 +478,7 @@ public class AppLoader implements ApplicationListener { if (this.screen != null) { this.screen.hide(); + this.screen.dispose(); } this.screen = screen; if (this.screen != null) { diff --git a/src/net/torvald/terrarum/LoadScreen.kt b/src/net/torvald/terrarum/LoadScreen.kt index f2627b535..9e3a33150 100644 --- a/src/net/torvald/terrarum/LoadScreen.kt +++ b/src/net/torvald/terrarum/LoadScreen.kt @@ -239,7 +239,7 @@ object LoadScreen : ScreenAdapter() { for (i in 0 until messages.elemCount) { Terrarum.fontGame.draw(it, messages[i] ?: "", - 40f, + AppLoader.getTvSafeGraphicsWidth() + 16f, 80f + (messages.size - i - 1) * Terrarum.fontGame.lineHeight ) } @@ -264,7 +264,7 @@ object LoadScreen : ScreenAdapter() { for (i in 0 until messages.elemCount) { Terrarum.fontGame.draw(it, messages[i] ?: "", - 40f, + AppLoader.getTvSafeGraphicsWidth() + 16f, 80f + (messages.size - i - 1) * Terrarum.fontGame.lineHeight ) } diff --git a/src/net/torvald/terrarum/UIItemInventoryElem.kt b/src/net/torvald/terrarum/UIItemInventoryElem.kt index 496cb4b80..4a4aa3b0e 100644 --- a/src/net/torvald/terrarum/UIItemInventoryElem.kt +++ b/src/net/torvald/terrarum/UIItemInventoryElem.kt @@ -198,7 +198,6 @@ class UIItemInventoryElem( override fun dispose() { - itemImage?.texture?.dispose() } override fun keyUp(keycode: Int): Boolean { diff --git a/src/net/torvald/terrarum/UIItemInventoryElemSimple.kt b/src/net/torvald/terrarum/UIItemInventoryElemSimple.kt index df5bce2f7..5482508c8 100644 --- a/src/net/torvald/terrarum/UIItemInventoryElemSimple.kt +++ b/src/net/torvald/terrarum/UIItemInventoryElemSimple.kt @@ -180,7 +180,6 @@ class UIItemInventoryElemSimple( override fun dispose() { - itemImage?.texture?.dispose() } override fun keyUp(keycode: Int): Boolean { diff --git a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt index 7817179bb..c1e05a5ea 100644 --- a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt +++ b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt @@ -186,7 +186,7 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) { } override fun dispose() { - IngameRenderer.dispose() + blockPointingCursor.dispose() } }