curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 18:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

making sure unused screen be disposed, and not breaking the app

Browse Source
This commit is contained in:
minjaesong
2019-01-31 13:29:40 +09:00
parent 90a7fcd4d0
commit 60db83eddb
6 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/locales/koKR/Polyglot-100_koKR.json
View File

@@ -2053,7 +2053,7 @@
}, },
{ {
"n": "MENU_LABEL_MAINMENU", "n": "MENU_LABEL_MAINMENU",
"s": "메뉴" "s": "메인 메뉴"
}, },
{ {
"n": "MENU_LABEL_MORE", "n": "MENU_LABEL_MORE",

1
src/net/torvald/terrarum/AppLoader.java
View File

@@ -478,6 +478,7 @@ public class AppLoader implements ApplicationListener {
if (this.screen != null) { if (this.screen != null) {
this.screen.hide(); this.screen.hide();
this.screen.dispose();
} }
this.screen = screen; this.screen = screen;
if (this.screen != null) { if (this.screen != null) {

4
src/net/torvald/terrarum/LoadScreen.kt
View File

@@ -239,7 +239,7 @@ object LoadScreen : ScreenAdapter() {
for (i in 0 until messages.elemCount) { for (i in 0 until messages.elemCount) {
Terrarum.fontGame.draw(it, Terrarum.fontGame.draw(it,
messages[i] ?: "", messages[i] ?: "",
40f, AppLoader.getTvSafeGraphicsWidth() + 16f,
80f + (messages.size - i - 1) * Terrarum.fontGame.lineHeight 80f + (messages.size - i - 1) * Terrarum.fontGame.lineHeight
) )
} }
@@ -264,7 +264,7 @@ object LoadScreen : ScreenAdapter() {
for (i in 0 until messages.elemCount) { for (i in 0 until messages.elemCount) {
Terrarum.fontGame.draw(it, Terrarum.fontGame.draw(it,
messages[i] ?: "", messages[i] ?: "",
40f, AppLoader.getTvSafeGraphicsWidth() + 16f,
80f + (messages.size - i - 1) * Terrarum.fontGame.lineHeight 80f + (messages.size - i - 1) * Terrarum.fontGame.lineHeight
) )
} }

1
src/net/torvald/terrarum/UIItemInventoryElem.kt
View File

@@ -198,7 +198,6 @@ class UIItemInventoryElem(
override fun dispose() { override fun dispose() {
itemImage?.texture?.dispose()
} }
override fun keyUp(keycode: Int): Boolean { override fun keyUp(keycode: Int): Boolean {

1
src/net/torvald/terrarum/UIItemInventoryElemSimple.kt
View File

@@ -180,7 +180,6 @@ class UIItemInventoryElemSimple(
override fun dispose() { override fun dispose() {
itemImage?.texture?.dispose()
} }
override fun keyUp(keycode: Int): Boolean { override fun keyUp(keycode: Int): Boolean {

2
src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
View File

@@ -186,7 +186,7 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {
} }
override fun dispose() { override fun dispose() {
IngameRenderer.dispose() blockPointingCursor.dispose()
} }
} }