mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-16 21:44:05 +09:00
Player movement seems like back to working, res→assets
Former-commit-id: f91181caee4dabf4cb2e51d8077441c6b0f83757 Former-commit-id: 8b450303698c5c85dea9145a056b290b95a6a7b0
This commit is contained in:
@@ -46,6 +46,17 @@ constructor(gamename: String) : StateBasedGame(gamename) {
|
||||
gameLocale = gameLocaleFromConfig
|
||||
|
||||
println("[terrarum] Locale: " + gameLocale)
|
||||
|
||||
try {
|
||||
Controllers.getController(0)
|
||||
environment = if (getConfigString("pcgamepadenv") == "console")
|
||||
RunningEnvironment.CONSOLE
|
||||
else
|
||||
RunningEnvironment.PC
|
||||
}
|
||||
catch (e: IndexOutOfBoundsException) {
|
||||
environment = RunningEnvironment.PC
|
||||
}
|
||||
}
|
||||
|
||||
@Throws(SlickException::class)
|
||||
@@ -63,8 +74,8 @@ constructor(gamename: String) : StateBasedGame(gamename) {
|
||||
}
|
||||
|
||||
ingame = StateInGame()
|
||||
addState(ingame)
|
||||
//addState(StateMonitorCheck())
|
||||
//addState(ingame)
|
||||
addState(StateMonitorCheck())
|
||||
}
|
||||
|
||||
companion object {
|
||||
@@ -111,6 +122,8 @@ constructor(gamename: String) : StateBasedGame(gamename) {
|
||||
lateinit var defaultSaveDir: String
|
||||
private set
|
||||
|
||||
lateinit var environment: RunningEnvironment
|
||||
|
||||
private val localeSimple = arrayOf("de", "en", "es", "it")
|
||||
var gameLocale = "####" // locale override
|
||||
set(value) {
|
||||
@@ -335,9 +348,9 @@ constructor(gamename: String) : StateBasedGame(gamename) {
|
||||
|
||||
private fun getConfigMaster(key: String): Any {
|
||||
var cfg: Any? = null
|
||||
try { cfg = gameConfig[key]!! }
|
||||
try { cfg = gameConfig[key.toLowerCase()]!! }
|
||||
catch (e: NullPointerException) {
|
||||
try { cfg = DefaultConfig.fetch()[key] }
|
||||
try { cfg = DefaultConfig.fetch()[key.toLowerCase()] }
|
||||
catch (e1: NullPointerException) { e.printStackTrace() }
|
||||
}
|
||||
return cfg!!
|
||||
@@ -372,3 +385,7 @@ fun setBlendScreen() {
|
||||
fun setBlendDisable() {
|
||||
GL11.glDisable(GL11.GL_BLEND)
|
||||
}
|
||||
|
||||
enum class RunningEnvironment {
|
||||
PC, CONSOLE, MOBILE
|
||||
}
|
||||
Reference in New Issue
Block a user