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

fixed a bug where inventory's cat icons would unloaded when you load the ingame second time

Browse Source
This commit is contained in:
minjaesong
2021-08-07 00:14:33 +09:00
parent 4b50b0cff1
commit f7ce911c9e
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/UIItemInventoryCatBar.kt
View File

@@ -31,7 +31,7 @@ class UIItemInventoryCatBar(
const val CAT_ALL = "__all__" const val CAT_ALL = "__all__"
} }
internal val catIcons: TextureRegionPack = CommonResourcePool.getAsTextureRegionPack("inventory_caticons") internal val catIcons: TextureRegionPack = CommonResourcePool.getAsTextureRegionPack("inventory_category")
internal val catArrangement: IntArray = intArrayOf(9,6,7,1,0,2,3,4,5,8) internal val catArrangement: IntArray = intArrayOf(9,6,7,1,0,2,3,4,5,8)
internal val catIconsMeaning = listOf( // sortedBy: catArrangement internal val catIconsMeaning = listOf( // sortedBy: catArrangement
arrayOf(GameItem.Category.WEAPON), arrayOf(GameItem.Category.WEAPON),
@@ -278,7 +278,7 @@ class UIItemInventoryCatBar(
override fun dispose() { override fun dispose() {
underlineIndTex.dispose() underlineIndTex.dispose()
//catIcons.dispose() // disposed of by the AppLoader //catIcons.dispose() // disposed of by the AppLoader
mainButtons.forEach { it.dispose() } //mainButtons.forEach { it.dispose() } // disposed of by the AppLoader
sideButtons.forEach { it.dispose() } //sideButtons.forEach { it.dispose() } // disposed of by the AppLoader
} }
} }

2
src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
View File

@@ -76,7 +76,7 @@ class UIInventoryFull(
init { init {
handler.allowESCtoClose = true handler.allowESCtoClose = true
CommonResourcePool.addToLoadingList("inventory_caticons") { CommonResourcePool.addToLoadingList("inventory_category") {
TextureRegionPack("./assets/graphics/gui/inventory/category.tga", 20, 20) TextureRegionPack("./assets/graphics/gui/inventory/category.tga", 20, 20)
} }
CommonResourcePool.loadAll() CommonResourcePool.loadAll()

4
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryEquippedView.kt
View File

@@ -50,7 +50,7 @@ class UIItemInventoryEquippedView(
val spriteViewBackCol: Color = CELLCOLOUR_BLACK val spriteViewBackCol: Color = CELLCOLOUR_BLACK
private val equipPosIcon = CommonResourcePool.getAsTextureRegionPack("inventory_caticons") private val equipPosIcon = CommonResourcePool.getAsTextureRegionPack("inventory_category")
private val cellToIcon = intArrayOf(0,1,2,3,4,5,6,7,6,7,6,7) private val cellToIcon = intArrayOf(0,1,2,3,4,5,6,7,6,7,6,7)
private val equipPosIconCol = Color(0xdddddd7f.toInt()) private val equipPosIconCol = Color(0xdddddd7f.toInt())
@@ -150,7 +150,7 @@ class UIItemInventoryEquippedView(
override fun dispose() { override fun dispose() {
itemGrid.forEach { it.dispose() } itemGrid.forEach { it.dispose() }
equipPosIcon.dispose() // equipPosIcon.dispose() // disposed of by the AppLoader
} }
override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {

8
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt
View File

@@ -478,13 +478,7 @@ class UIItemInventoryItemGrid(
} }
override fun dispose() { override fun dispose() {
itemList.forEach { it.dispose() }
itemGrid.forEach { it.dispose() }
// the icons are using common resources that are disposed when the app quits
//gridModeButtons.forEach { it.dispose() }
//scrollUpButton.dispose()
//scrollDownButton.dispose()
//walletFont.dispose()
} }
override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {