From 018160b5415ca4d51e9d28eec7d633f26e019d6f Mon Sep 17 00:00:00 2001
From: Minjae Song <alswo9628@gmail.com>
Date: Tue, 13 Aug 2019 15:50:31 +0900
Subject: [PATCH] fix func name conflict

---
 src/net/torvald/terrarum/TitleScreen.kt                   | 2 +-
 src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt  | 2 +-
 src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt | 2 +-
 src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt
index dbe197f51..7f84cf9ea 100644
--- a/src/net/torvald/terrarum/TitleScreen.kt
+++ b/src/net/torvald/terrarum/TitleScreen.kt
@@ -152,7 +152,7 @@ class TitleScreen(batch: SpriteBatch) : IngameInstance(batch) {
         demoWorld.worldTime.timeDelta = 150
 
 
-        IngameRenderer.setWorld(demoWorld)
+        IngameRenderer.setRenderedWorld(demoWorld)
 
 
         uiMenu = UIRemoCon(UITitleRemoConYaml())//UITitleRemoConRoot()
diff --git a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
index 8c2a254f5..eb3bfb225 100644
--- a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
+++ b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
@@ -307,7 +307,7 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {
         uiPalette.setPosition(200, 100)
 
 
-        IngameRenderer.setWorld(gameWorld)
+        IngameRenderer.setRenderedWorld(gameWorld)
     }
 
     override fun show() {
diff --git a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
index 20d3ee102..782a901ed 100644
--- a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
+++ b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
@@ -157,7 +157,7 @@ object IngameRenderer : Disposable {
      * - When the main scene that renders the world is first created
      * - When the game make transition to the new world (advancing to the next level/entering or exiting the room)
      */
-    fun setWorld(world: GameWorld) {
+    fun setRenderedWorld(world: GameWorld) {
             try {
                 if (this.world != world) {
                     printdbg(this, "World change detected -- " +
diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
index 19e18b360..d1f98cfb1 100644
--- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
@@ -189,7 +189,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
             GameLoadMode.LOAD_FROM  -> enter(gameLoadInfoPayload as GameSaveData)
         }
 
-        IngameRenderer.setWorld(gameworld)
+        IngameRenderer.setRenderedWorld(gameworld)
 
 
         super.show() // gameInitialised = true