From 0e474b02d4ebf28d5a2716728f5ace6f44f6f202 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Fri, 10 Mar 2017 21:23:51 +0900 Subject: [PATCH] minor fixes in UI with aliases Former-commit-id: 539604058bcf7e545de920b1c7a5958e30577a34 --- src/net/torvald/terrarum/StateInGame.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index e03f15273..4af050624 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -167,8 +167,6 @@ class StateInGame : BasicGameState() { uiAliases[UI_QUICK_BAR] = UIHandler(UIQuickBar()) uiAliases[UI_QUICK_BAR]!!.isVisible = true uiAliases[UI_QUICK_BAR]!!.setPosition(0, 0) - uiAliases[UI_QUICK_BAR]!!.UI.handler = uiAliases[UI_QUICK_BAR] - uiContainer.add(uiAliases[UI_QUICK_BAR]!!) // pie menu uiAliases[UI_PIE_MENU] = UIHandler(UIPieMenu()) @@ -176,13 +174,11 @@ class StateInGame : BasicGameState() { (Terrarum.WIDTH - uiAliases[UI_PIE_MENU]!!.UI.width) / 2, (Terrarum.HEIGHT - uiAliases[UI_PIE_MENU]!!.UI.height) / 2 ) - uiAliases[UI_PIE_MENU]!!.UI.handler = uiAliases[UI_PIE_MENU] - uiContainer.add(uiAliases[UI_PIE_MENU]!!) // vital metre // fill in getter functions by // (uiAliases[UI_QUICK_BAR]!!.UI as UIVitalMetre).vitalGetterMax = { some_function } - uiAliases[UI_VITAL1] = UIHandler(UIVitalMetre(player, { null }, { null }, null, 0)) + uiAliases[UI_VITAL1] = UIHandler(UIVitalMetre(player, { 80f }, { 100f }, Color.green, 0)) uiAliases[UI_VITAL1]!!.setAsAlwaysVisible() uiAliases[UI_VITAL2] = UIHandler(UIVitalMetre(player, { null }, { null }, null, 1)) uiAliases[UI_VITAL2]!!.setAsAlwaysVisible() @@ -190,6 +186,13 @@ class StateInGame : BasicGameState() { uiAliases[UI_VITAL3]!!.setAsAlwaysVisible() + // batch-process uiAliases + uiAliases.forEach { _, uiHandler -> + uiHandler.UI.handler = uiHandler // attach UIHandlers + uiContainer.add(uiHandler) // put them all to the UIContainer + } + +