curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 11:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix func name conflict

Browse Source
This commit is contained in:
Minjae Song
2019-08-13 15:50:31 +09:00
parent 9b470bb3bb
commit 018160b541
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/TitleScreen.kt
View File

@@ -152,7 +152,7 @@ class TitleScreen(batch: SpriteBatch) : IngameInstance(batch) {
demoWorld.worldTime.timeDelta = 150 demoWorld.worldTime.timeDelta = 150
IngameRenderer.setWorld(demoWorld) IngameRenderer.setRenderedWorld(demoWorld)
uiMenu = UIRemoCon(UITitleRemoConYaml())//UITitleRemoConRoot() uiMenu = UIRemoCon(UITitleRemoConYaml())//UITitleRemoConRoot()

2
src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
View File

@@ -307,7 +307,7 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {
uiPalette.setPosition(200, 100) uiPalette.setPosition(200, 100)
IngameRenderer.setWorld(gameWorld) IngameRenderer.setRenderedWorld(gameWorld)
} }
override fun show() { override fun show() {

2
src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
View File

@@ -157,7 +157,7 @@ object IngameRenderer : Disposable {
* - When the main scene that renders the world is first created * - 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) * - 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 { try {
if (this.world != world) { if (this.world != world) {
printdbg(this, "World change detected -- " + printdbg(this, "World change detected -- " +

2
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -189,7 +189,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
GameLoadMode.LOAD_FROM -> enter(gameLoadInfoPayload as GameSaveData) GameLoadMode.LOAD_FROM -> enter(gameLoadInfoPayload as GameSaveData)
} }
IngameRenderer.setWorld(gameworld) IngameRenderer.setRenderedWorld(gameworld)
super.show() // gameInitialised = true super.show() // gameInitialised = true