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

font upd

Browse Source 
Former-commit-id: bf42a690c7cd199d4f2ec00855213b83aecb144b
Former-commit-id: b992aac69b93c5d1632e96c4985cf61a6419b6a8
This commit is contained in:
Song Minjae
2017-02-20 01:43:26 +09:00
parent 076c5ba1f1
commit c48308efe1
6 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,17 +67,6 @@ constructor(gamename: String) : StateBasedGame(gamename) {
val readFromDisk = readConfigJson()
if (!readFromDisk) readConfigJson()
// get locale from config
val gameLocaleFromConfig = gameConfig.getAsString("language") ?: sysLang
// if bad game locale were set, use system locale
if (gameLocaleFromConfig.length < 2)
gameLocale = sysLang
else
gameLocale = gameLocaleFromConfig
println("[Terrarum] Locale: " + gameLocale)
try {
Controllers.getController(0)
environment = if (getConfigString("pcgamepadenv") == "console")
@@ -94,9 +83,24 @@ constructor(gamename: String) : StateBasedGame(gamename) {
override fun initStatesList(gc: GameContainer) {
gc.input.enableKeyRepeat()
// get locale from config
val gameLocaleFromConfig = gameConfig.getAsString("language") ?: sysLang
// if bad game locale were set, use system locale
if (gameLocaleFromConfig.length < 2)
gameLocale = sysLang
else
gameLocale = gameLocaleFromConfig
println("[Terrarum] Locale: " + gameLocale)
fontGame = GameFontImpl()
fontSmallNumbers = TinyAlphNum()
// search for real controller
// exclude controllers with name "Mouse", "keyboard"
val notControllerRegex = Regex("mouse|keyboard")
@@ -212,9 +216,11 @@ constructor(gamename: String) : StateBasedGame(gamename) {
field = value.substring(0..1)
else
field = value
if (fontGame != null) (fontGame as GameFontImpl).reload()
}
lateinit var fontGame: Font
var fontGame: Font? = null
private set
lateinit var fontSmallNumbers: Font
private set
@@ -282,6 +288,9 @@ constructor(gamename: String) : StateBasedGame(gamename) {
const val NAME = "Terrarum"
fun main(args: Array<String>) {
System.setProperty("java.library.path", "lib")
System.setProperty("org.lwjgl.librarypath", File("lib").absolutePath)
try {
appgc = AppGameContainer(Terrarum(NAME))
appgc.setDisplayMode(WIDTH, HEIGHT, false)
@@ -301,7 +310,7 @@ constructor(gamename: String) : StateBasedGame(gamename) {
appgc.start()
}
catch (ex: SlickException) {
catch (ex: Exception) {
val logger = Logger.getLogger(Terrarum::class.java.name)
val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss")
val calendar = Calendar.getInstance()