From 801acd2f2421255f5fd4392a07349686198e16f6 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Mon, 26 Dec 2022 02:35:03 +0900
Subject: [PATCH] vals instead of funs

---
 .../terrarum/modulebasegame/BuildingMaker.kt  | 19 ++++++++++---------
 .../terrarum/modulebasegame/TerrarumIngame.kt |  6 +++---
 .../terrarum/modulebasegame/TitleScreen.kt    |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
index 6705896b4..cd64c9d9a 100644
--- a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
+++ b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
@@ -315,15 +315,16 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
 
 
         // ASYNCHRONOUS UPDATE AND RENDER //
-        gameUpdateGovernor.update(Gdx.graphics.deltaTime, App.UPDATE_RATE, { dt -> updateGame(dt) }, { renderGame() })
+        gameUpdateGovernor.update(Gdx.graphics.deltaTime, App.UPDATE_RATE, updateGame, renderGame
+        )
         App.setDebugTime("Ingame.Render - (Light + Tiling)",
-                ((App.debugTimers["Ingame.Render"] as? Long) ?: 0) -
+                ((App.debugTimers["Ingame.Render"]) ?: 0) -
                 (
-                        ((App.debugTimers["Renderer.Lanterns"] as? Long) ?: 0) +
-                        ((App.debugTimers["Renderer.LightPrecalc"] as? Long) ?: 0) +
-                        ((App.debugTimers["Renderer.LightRuns"] as? Long) ?: 0) +
-                        ((App.debugTimers["Renderer.LightToScreen"] as? Long) ?: 0) +
-                        ((App.debugTimers["Renderer.Tiling"] as? Long) ?: 0)
+                        ((App.debugTimers["Renderer.Lanterns"]) ?: 0) +
+                        ((App.debugTimers["Renderer.LightPrecalc"]) ?: 0) +
+                        ((App.debugTimers["Renderer.LightRuns"]) ?: 0) +
+                        ((App.debugTimers["Renderer.LightToScreen"]) ?: 0) +
+                        ((App.debugTimers["Renderer.Tiling"]) ?: 0)
                 )
         )
 
@@ -333,7 +334,7 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
     internal var tappedOnUI = false // when true, even if the UI is closed, pen won't work unless your pen is lifted
     // must be set to TRUE by UIs
 
-    private fun updateGame(delta: Float) {
+    private val updateGame = { delta: Float ->
 
         WeatherMixer.update(delta, actorNowPlaying, gameWorld)
         blockPointingCursor.update(delta)
@@ -377,7 +378,7 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
 
     private val particles = CircularArray<ParticleBase>(16, true)
 
-    private fun renderGame() {
+    private val renderGame = { delta: Float ->
         _testMarkerDrawCalls = 0L
 
         IngameRenderer.invoke(false,
diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
index ffdbb9d26..fe5cb2478 100644
--- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
@@ -719,7 +719,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
         val dt = Gdx.graphics.deltaTime
         autosaveTimer += dt
 
-        gameUpdateGovernor.update(dt, App.UPDATE_RATE, { dt -> updateGame(dt) }, { renderGame() })
+        gameUpdateGovernor.update(dt, App.UPDATE_RATE, updateGame, renderGame)
 
 
         val autosaveInterval = App.getConfigInt("autosaveinterval").coerceAtLeast(60000) / 1000f
@@ -739,7 +739,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
     /**
      * Ingame (world) related updates; UI update must go to renderGame()
      */
-    protected fun updateGame(delta: Float) {
+    private val updateGame =  { delta: Float ->
         val world = this.world
         worldWidth = world.width.toDouble() * TILE_SIZE
 
@@ -862,7 +862,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
     }
 
 
-    private fun renderGame() {
+    private val renderGame = { delta: Float ->
         Gdx.graphics.setTitle(getCanonicalTitle())
 
         WorldCamera.update(world, actorNowPlaying)
diff --git a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt
index 0aed01606..5da9a4e47 100644
--- a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt
@@ -250,10 +250,10 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
 
     override fun render(updateRate: Float) {
         // async update and render
-        gameUpdateGovernor.update(Gdx.graphics.deltaTime, App.UPDATE_RATE, { dt -> updateScreen(dt) }, { renderScreen() })
+        gameUpdateGovernor.update(Gdx.graphics.deltaTime, App.UPDATE_RATE, updateScreen, renderScreen)
     }
 
-    fun updateScreen(delta: Float) {
+    private val updateScreen = { delta: Float ->
         demoWorld.globalLight = WeatherMixer.globalLightNow
         demoWorld.updateWorldTime(delta)
         WeatherMixer.update(delta, cameraPlayer, demoWorld)
@@ -269,7 +269,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
 
     private val particles = CircularArray<ParticleBase>(16, true)
 
-    fun renderScreen() {
+    private val renderScreen = { delta: Float ->
         Gdx.graphics.setTitle(TerrarumIngame.getCanonicalTitle())