From 5738418f39b8bbe1346deb83a61bcd8405846a23 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 20 Jan 2019 06:43:59 +0900 Subject: [PATCH] the simplest case of noclip=true --- src/net/torvald/terrarum/gameactors/ActorWBMovable.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/gameactors/ActorWBMovable.kt b/src/net/torvald/terrarum/gameactors/ActorWBMovable.kt index b6bd081ca..6a441437a 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWBMovable.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWBMovable.kt @@ -358,6 +358,8 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean = override fun update(delta: Float) { if (isUpdate && !flagDespawn) { + val ddelta = delta.toFloat() + if (!assertPrinted) assertInit() if (sprite != null) sprite!!.update(delta) @@ -410,8 +412,8 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean = displaceHitbox() } else { - hitbox.translate(externalForce) - hitbox.translate(controllerMoveDelta) + val vecSum = externalForce + (controllerMoveDelta ?: Vector2(0.0, 0.0)) + hitbox.translate(vecSum * (Terrarum.PHYS_REF_FPS * ddelta)) } //////////////////////////////////////////////////////////////