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

mouse buttons now configurable

Browse Source 
Former-commit-id: 789b34a0a80553afc7fa7f563ffa33350310ac21
Former-commit-id: 8b3687ee15aa53fb6decb8480ebdf6897b5cce61
This commit is contained in:
Song Minjae
2016-12-30 23:28:06 +09:00
parent 0b024dcf70
commit da06e0fa93
5 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/torvald/terrarum/gamecontroller/EnumKeyFunc.kt
View File

@@ -5,5 +5,6 @@ package net.torvald.terrarum.gamecontroller
*/
enum class EnumKeyFunc {
UI_CONSOLE, UI_BASIC_INFO,
MOVE_LEFT, MOVE_RIGHT, MOVE_UP, MOVE_DOWN, JUMP
MOVE_LEFT, MOVE_RIGHT, MOVE_UP, MOVE_DOWN, JUMP,
HAND_PRIMARY, HAND_SECONDARY
}

2
src/net/torvald/terrarum/gamecontroller/GameController.kt
View File

@@ -138,7 +138,7 @@ object GameController {
}
private fun keyPressedByCode(key: Int, fn: EnumKeyFunc): Boolean {
return KeyMap.getKeyCode(fn) == key
return KeyMap[fn] == key
}
}

6
src/net/torvald/terrarum/gamecontroller/KeyMap.kt
View File

@@ -18,13 +18,15 @@ object KeyMap {
map_code.put(EnumKeyFunc.JUMP, Terrarum.getConfigInt("keyjump"))
map_code.put(EnumKeyFunc.UI_CONSOLE, Key.GRAVE)
map_code.put(EnumKeyFunc.UI_BASIC_INFO, Key.F3)
map_code.put(EnumKeyFunc.HAND_PRIMARY, Terrarum.getConfigInt("mousePrimary"))
map_code.put(EnumKeyFunc.HAND_SECONDARY, Terrarum.getConfigInt("mouseSecondary"))
}
fun getKeyCode(fn: EnumKeyFunc): Int {
operator fun get(fn: EnumKeyFunc): Int {
return map_code[fn]!!
}
fun set(func: EnumKeyFunc, key: Int) {
operator fun set(func: EnumKeyFunc, key: Int) {
map_code.put(func, key)
}