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

support for screen-overlay actors; buildingmaker has light now

Browse Source
This commit is contained in:
Minjae Song
2018-12-12 02:49:09 +09:00
parent 258273fd25
commit 7a60ae0629
7 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -421,17 +421,17 @@ object Terrarum : Screen {
// jump right into the ingame
val ingame = Ingame(batch)
/*val ingame = Ingame(batch)
ingame.gameLoadInfoPayload = Ingame.NewWorldParameters(2400, 800, HQRNG().nextLong())
ingame.gameLoadMode = Ingame.GameLoadMode.CREATE_NEW
LoadScreen.screenToLoad = ingame
this.ingame = ingame
setScreen(LoadScreen)
setScreen(LoadScreen)*/
// title screen
//AppLoader.getINSTANCE().setScreen(TitleScreen(batch))
AppLoader.getINSTANCE().setScreen(TitleScreen(batch))
}
fun setScreen(screen: Screen) {
@@ -728,6 +728,7 @@ object Terrarum : Screen {
Actor.RenderOrder.MIDDLE -> Actor.RANGE_MIDDLE
Actor.RenderOrder.MIDTOP -> Actor.RANGE_MIDTOP
Actor.RenderOrder.FRONT -> Actor.RANGE_FRONT
Actor.RenderOrder.OVERLAY-> Actor.RANDE_OVERLAY
}
}
catch (gameNotInitialisedException: KotlinNullPointerException) {