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

load screen actually draws the world

Browse Source 
transition still not working
This commit is contained in:
minjaesong
2019-11-27 16:42:49 +09:00
parent c13aebd3ba
commit a66dc344b3
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,8 +180,8 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
// gameLoadMode and gameLoadInfoPayload must be set beforehand!!
when (gameLoadMode) {
GameLoadMode.CREATE_NEW -> enter(gameLoadInfoPayload as NewWorldParameters)
GameLoadMode.LOAD_FROM -> enter(gameLoadInfoPayload as GameSaveData)
GameLoadMode.CREATE_NEW -> enterCreateNewWorld(gameLoadInfoPayload as NewWorldParameters)
GameLoadMode.LOAD_FROM -> enterLoadFromSave(gameLoadInfoPayload as GameSaveData)
}
IngameRenderer.setRenderedWorld(gameworld)
@@ -220,7 +220,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
/**
* Init instance by loading saved world
*/
private fun enter(gameSaveData: GameSaveData) {
private fun enterLoadFromSave(gameSaveData: GameSaveData) {
if (gameInitialised) {
printdbg(this, "loaded successfully.")
}
@@ -243,7 +243,7 @@ open class TerrarumIngame(batch: SpriteBatch) : IngameInstance(batch) {
/**
* Init instance by creating new world
*/
private fun enter(worldParams: NewWorldParameters) {
private fun enterCreateNewWorld(worldParams: NewWorldParameters) {
printdbg(this, "Ingame called")
printStackTrace(this)