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

removing old hacks

Browse Source
This commit is contained in:
Song Minjae
2017-03-23 21:15:40 +09:00
parent 0e7e6ab934
commit ddf2e28901
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Slick2d/GameFontBase.kt
View File

@@ -132,15 +132,14 @@ open class GameFontBase : Font {
val chr = s[i] val chr = s[i]
val ctype = getSheetType(s[i]) val ctype = getSheetType(s[i])
if (chr.toInt() == 0x21B) // Romanian t; HAX! if (variableWidthSheets.contains(ctype)) {
len += 6 len += try {
else if (variableWidthSheets.contains(ctype)) { asciiWidths[chr.toInt()]!!
try {
len += asciiWidths[chr.toInt()]!!
} }
catch (e: kotlin.KotlinNullPointerException) { catch (e: kotlin.KotlinNullPointerException) {
println("KotlinNullPointerException on glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}") println("KotlinNullPointerException on glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}")
System.exit(1) //System.exit(1)
W_LATIN_WIDE // failsafe
} }
} }
else if (zeroWidthSheets.contains(ctype)) else if (zeroWidthSheets.contains(ctype))

11
demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt
View File

@@ -132,15 +132,14 @@ open class GameFontBase : Font {
val chr = s[i] val chr = s[i]
val ctype = getSheetType(s[i]) val ctype = getSheetType(s[i])
if (chr.toInt() == 0x21B) // Romanian t; HAX! if (variableWidthSheets.contains(ctype)) {
len += 6 len += try {
else if (variableWidthSheets.contains(ctype)) { asciiWidths[chr.toInt()]!!
try {
len += asciiWidths[chr.toInt()]!!
} }
catch (e: kotlin.KotlinNullPointerException) { catch (e: kotlin.KotlinNullPointerException) {
println("KotlinNullPointerException on glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}") println("KotlinNullPointerException on glyph number ${Integer.toHexString(chr.toInt()).toUpperCase()}")
System.exit(1) //System.exit(1)
W_LATIN_WIDE // failsafe
} }
} }
else if (zeroWidthSheets.contains(ctype)) else if (zeroWidthSheets.contains(ctype))