abolished a need to pass world as parametre

+ simply changing the single variable (ingame.world) will update all the renderer's behaviour
+ somehow my git changelogs are exploding

src/net/torvald/terrarum/modulebasegame/gameactors/ActorHumanoid.kt

@@ -25,12 +25,13 @@ import java.util.*
  * Created by minjaesong on 2016-10-24.
  */
 open class ActorHumanoid(
-        world: GameWorld,
         birth: time_t,
         death: time_t? = null,
         usePhysics: Boolean = true
-) : ActorWBMovable(world, RenderOrder.MIDDLE, usePhysics = usePhysics), Controllable, Pocketed, Factionable, Luminous, LandHolder, HistoricalFigure {
+) : ActorWBMovable(RenderOrder.MIDDLE, usePhysics = usePhysics), Controllable, Pocketed, Factionable, Luminous, LandHolder, HistoricalFigure {
 
+    private val world: GameWorld?
+        get() = Terrarum.ingame?.world
 
 
     var vehicleRiding: Controllable? = null // usually player only
@@ -50,11 +51,11 @@ open class ActorHumanoid(
     override var houseDesignation: ArrayList<Long>? = ArrayList()
 
     override fun addHouseTile(x: Int, y: Int) {
-        if (houseDesignation != null) houseDesignation!!.add(LandUtil.getBlockAddr(world, x, y))
+        if (houseDesignation != null) houseDesignation!!.add(LandUtil.getBlockAddr(world!!, x, y))
     }
 
     override fun removeHouseTile(x: Int, y: Int) {
-        if (houseDesignation != null) houseDesignation!!.remove(LandUtil.getBlockAddr(world, x, y))
+        if (houseDesignation != null) houseDesignation!!.remove(LandUtil.getBlockAddr(world!!, x, y))
     }
 
     override fun clearHouseDesignation() {

src/net/torvald/terrarum/modulebasegame/gameactors/CreatureBuilder.kt

@@ -15,8 +15,8 @@ object CreatureBuilder {
     /**
      * @Param jsonFileName with extension
      */
-    operator fun invoke(world: GameWorld, module: String, jsonFileName: String): ActorWBMovable {
-        val actor = ActorWBMovable(world, Actor.RenderOrder.MIDDLE)
+    operator fun invoke(module: String, jsonFileName: String): ActorWBMovable {
+        val actor = ActorWBMovable(Actor.RenderOrder.MIDDLE)
         InjectCreatureRaw(actor.actorValue, module, jsonFileName)
 
 

src/net/torvald/terrarum/modulebasegame/gameactors/DecodeTapestry.kt

@@ -173,6 +173,6 @@ object DecodeTapestry {
             readCounter++
         }
 
-        return TapestryObject((Terrarum.ingame!!.world), outImageData, artName, authorName)
+        return TapestryObject(outImageData, artName, authorName)
     }
 }

src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt

@@ -10,7 +10,7 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
  * Created by minjaesong on 2016-03-15.
  */
-open class DroppedItem(world: GameWorld, private val item: GameItem) : ActorWBMovable(world, RenderOrder.MIDTOP) {
+open class DroppedItem(private val item: GameItem) : ActorWBMovable(RenderOrder.MIDTOP) {
 
     init {
         if (item.dynamicID >= ItemCodex.ACTORID_MIN)

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt

@@ -6,8 +6,8 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
  * Created by minjaesong on 2016-06-17.
  */
-open class FixtureBase(world: GameWorld, physics: Boolean = true) :
-        ActorWBMovable(world, RenderOrder.BEHIND, immobileBody = true, usePhysics = physics) {
+open class FixtureBase(physics: Boolean = true) :
+        ActorWBMovable(RenderOrder.BEHIND, immobileBody = true, usePhysics = physics) {
     /**
      * 0: Open
      * 1: Blocked

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTikiTorch.kt

@@ -14,7 +14,7 @@ import java.util.*
 /**
  * Created by minjaesong on 2016-06-17.
  */
-internal class FixtureTikiTorch(world: GameWorld) : FixtureBase(world), Luminous {
+internal class FixtureTikiTorch : FixtureBase(), Luminous {
 
     override var color: Color
         get() = BlockCodex[Block.TORCH].luminosity

src/net/torvald/terrarum/modulebasegame/gameactors/HumanoidNPC.kt

@@ -15,12 +15,11 @@ import net.torvald.terrarum.modulebasegame.gameworld.time_t
  * Created by minjaesong on 2016-01-31.
  */
 open class HumanoidNPC(
-        world: GameWorld,
         override val ai: ActorAI, // it's there for written-in-Kotlin, "hard-wired" AIs
         born: time_t,
         usePhysics: Boolean = true,
         forceAssignRefID: Int? = null
-) : ActorHumanoid(world, born, usePhysics = usePhysics), AIControlled, CanBeAnItem {
+) : ActorHumanoid(born, usePhysics = usePhysics), AIControlled, CanBeAnItem {
 
     companion object {
         val DEFAULT_COLLISION_TYPE = COLLISION_DYNAMIC

src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt

@@ -11,7 +11,7 @@ import net.torvald.terrarum.modulebasegame.gameworld.time_t
  * Created by minjaesong on 2015-12-31.
  */
 
-class IngamePlayer(world: GameWorldExtension, born: time_t) : ActorHumanoid(world, born) {
+class IngamePlayer(born: time_t) : ActorHumanoid(born) {
 
     /**
      * Creates new Player instance with empty elements (sprites, actorvalue, etc.).

src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestBall.kt

@@ -10,7 +10,7 @@ import net.torvald.terrarum.modulebasegame.worldgenerator.RoguelikeRandomiser
 /**
  * Created by minjaesong on 2016-03-05.
  */
-class PhysTestBall(world: GameWorld) : ActorWBMovable(world, RenderOrder.MIDDLE, immobileBody = true) {
+class PhysTestBall : ActorWBMovable(RenderOrder.MIDDLE, immobileBody = true) {
 
     private var color = Color.GOLD
 

src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestLuarLander.kt

@@ -15,7 +15,7 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
  * Created by minjaesong on 2018-01-17.
  */
-class PhysTestLuarLander(world: GameWorld) : ActorWBMovable(world, RenderOrder.MIDTOP), Controllable {
+class PhysTestLuarLander : ActorWBMovable(RenderOrder.MIDTOP), Controllable {
 
     private val texture = Texture(ModMgr.getGdxFile("basegame", "sprites/phystest_lunarlander.tga"))
 

src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt

@@ -13,7 +13,7 @@ object PlayerBuilder {
     operator fun invoke(): Actor {
         val world = (Terrarum.ingame!! as Ingame).gameworld
 
-        val p: Actor = IngamePlayer(world, world.time.TIME_T)
+        val p: Actor = IngamePlayer(world.time.TIME_T)
         InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")
 
         // attach sprite

src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderCynthia.kt

@@ -16,7 +16,6 @@ object PlayerBuilderCynthia {
     operator fun invoke(): ActorWBMovable {
         //val p: IngamePlayer = IngamePlayer(GameDate(100, 143)) // random value thrown
         val p: HumanoidNPC = HumanoidNPC(
-                (Terrarum.ingame!!.world),
                 NullAI(),
                 -589141658L) // random value thrown
         InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")

src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt

@@ -17,7 +17,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 object PlayerBuilderSigrid {
 
     operator fun invoke(): IngamePlayer {
-        val p = IngamePlayer((Terrarum.ingame!! as Ingame).gameworld, -9223372036854775807L) // XD
+        val p = IngamePlayer(-9223372036854775807L) // XD
 
         p.referenceID = 0x51621D // the only constant of this procedural universe
 

src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt

@@ -12,7 +12,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
  */
 object PlayerBuilderTestSubject1 {
     operator fun invoke(): IngamePlayer {
-        val p: IngamePlayer = IngamePlayer((Terrarum.ingame!! as Ingame).gameworld, -589141658L) // random value thrown
+        val p: IngamePlayer = IngamePlayer(-589141658L) // random value thrown
         InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")
 
 

src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileHoming.kt

@@ -7,11 +7,10 @@ import org.dyn4j.geometry.Vector2
  * Created by minjaesong on 2016-08-29.
  */
 class ProjectileHoming(
-        world: GameWorld,
         type: Int,
         fromPoint: Vector2, // projected coord
         toPoint: Vector2    // arriving coord
-) : ProjectileSimple(world, type, fromPoint, toPoint) {
+) : ProjectileSimple(type, fromPoint, toPoint) {
 
 
 

src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileSimple.kt

@@ -21,11 +21,10 @@ import java.util.*
 
 // TODO simplified, lightweight physics (does not call PhysicsSolver)
 open class ProjectileSimple(
-        world: GameWorld,
         private val type: Int,
         fromPoint: Vector2, // projected coord
         toPoint: Vector2    // arriving coord
-) : ActorWBMovable(world, RenderOrder.MIDTOP), Luminous, Projectile {
+) : ActorWBMovable(RenderOrder.MIDTOP), Luminous, Projectile {
 
     val damage: Int
     val displayColour: Color

src/net/torvald/terrarum/modulebasegame/gameactors/TapestryObject.kt

@@ -10,7 +10,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 /**
  * Created by minjaesong on 2017-01-07.
  */
-class TapestryObject(world: GameWorld, pixmap: Pixmap, val artName: String, val artAuthor: String) : FixtureBase(world, physics = false) {
+class TapestryObject(pixmap: Pixmap, val artName: String, val artAuthor: String) : FixtureBase(physics = false) {
 
     // physics = false only speeds up for ~2 frames with 50 tapestries
 

src/net/torvald/terrarum/modulebasegame/gameactors/WeaponSwung.kt

@@ -9,7 +9,7 @@ import net.torvald.terrarum.gameworld.GameWorld
 /**
  * Created by minjaesong on 2016-04-26.
  */
-class WeaponSwung(world: GameWorld, val itemID: Int) : ActorWBMovable(world, RenderOrder.MIDTOP), Luminous {
+class WeaponSwung(val itemID: Int) : ActorWBMovable(RenderOrder.MIDTOP), Luminous {
     // just let the solver use AABB; it's cheap but works just enough
 
     /**