From 05b374bfa77a1252687a63b763a4d32faa42f8e7 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sun, 1 May 2016 11:35:00 +0900 Subject: [PATCH] no multithreading for actor update Former-commit-id: aa575fabff183802cd326b24d5788bd44adbad95 Former-commit-id: a0d2b650aa5d3f19717049b17284eb76c694b24b --- src/net/torvald/terrarum/Game.kt | 3 +-- src/net/torvald/terrarum/gameactors/Actor.kt | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/net/torvald/terrarum/Game.kt b/src/net/torvald/terrarum/Game.kt index c221842f0..0cdd307f5 100644 --- a/src/net/torvald/terrarum/Game.kt +++ b/src/net/torvald/terrarum/Game.kt @@ -349,8 +349,7 @@ constructor() : BasicGameState() { i-- // array removed 1 elem, so also decrement counter by 1 } else { - //actorContainer[i].update(gc, delta) - actorContainer[i].start() + actorContainer[i].update(gc, delta) } i++ } diff --git a/src/net/torvald/terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt index 028a69a8a..7f9e61f28 100644 --- a/src/net/torvald/terrarum/gameactors/Actor.kt +++ b/src/net/torvald/terrarum/gameactors/Actor.kt @@ -9,14 +9,7 @@ import org.newdawn.slick.GameContainer */ abstract class Actor : Comparable, Runnable { - abstract protected fun update(gc: GameContainer, delta_t: Int) // use start() for multithreaded env - - protected var thread: Thread? = null - - fun start() { - thread = Thread(this, "ID: $referenceID") - thread!!.run() - } + abstract fun update(gc: GameContainer, delta_t: Int) /** * Valid RefID is equal to or greater than 32768.