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

ability to change current player as other NPC (maybe… maybe not…)

Browse Source 
Former-commit-id: 54773bfa17456aaf42003c1d514e80dd860f58eb
Former-commit-id: e84f8312c99cff0e0692a492b7b850d09ffe4e44
This commit is contained in:
Song Minjae
2016-10-23 17:21:20 +09:00
parent 2b31bb962a
commit 9e8171b5b9
12 changed files with 106 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,8 @@ object GameController {
if (!Terrarum.ingame.consoleHandler.isTakingControl) {
if (Terrarum.ingame.player.vehicleRiding != null) {
Terrarum.ingame.player.vehicleRiding!!.processInput(input)
if (Terrarum.ingame.player is Player && (Terrarum.ingame.player as Player).vehicleRiding != null) {
(Terrarum.ingame.player as Player).vehicleRiding!!.processInput(input)
}
Terrarum.ingame.player.processInput(input)
@@ -83,8 +83,8 @@ object GameController {
if (!Terrarum.ingame.consoleHandler.isTakingControl) {
if (Terrarum.ingame.player.vehicleRiding != null) {
Terrarum.ingame.player.vehicleRiding!!.keyPressed(key, c)
if (Terrarum.ingame.player is Player && (Terrarum.ingame.player as Player).vehicleRiding != null) {
(Terrarum.ingame.player as Player).vehicleRiding!!.keyPressed(key, c)
}
Terrarum.ingame.player.keyPressed(key, c)