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

fixed uiItem stupidity with uiCanvas; it activated even if its parent is invisible

Browse Source
This commit is contained in:
minjaesong
2017-10-24 07:25:05 +09:00
parent d1f3a491f1
commit 977df44316
7 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,9 +111,12 @@ class UIItemInventoryElemSimple(
override fun keyDown(keycode: Int): Boolean {
if (item != null && Terrarum.ingame != null && keycode in Input.Keys.NUM_1..Input.Keys.NUM_0) {
println("keydown elemgrid")
val inventory = Terrarum.ingame!!.player.inventory
val slot = if (keycode == Input.Keys.NUM_0) 9 else keycode - Input.Keys.NUM_1
val currentSlotItem = inventory?.getQuickBar(slot)
val currentSlotItem = inventory.getQuickBar(slot)
inventory.setQuickBar(
@@ -137,6 +140,8 @@ class UIItemInventoryElemSimple(
}
override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
//println("touchdown elemgrid")
if (item != null && Terrarum.ingame != null) {
// equip da shit