diff --git a/src/net/torvald/terrarum/console/EchoError.kt b/src/net/torvald/terrarum/console/EchoError.kt index 2a20b2770..fd0cda12f 100644 --- a/src/net/torvald/terrarum/console/EchoError.kt +++ b/src/net/torvald/terrarum/console/EchoError.kt @@ -9,12 +9,12 @@ import net.torvald.terrarum.ui.ConsoleWindow */ internal object EchoError : ConsoleCommand { override fun execute(args: Array) { - val argsWoHeader = Array(args.size - 1, {it -> args[it + 1]}) + val argsWoHeader = Array(args.size - 1) { args[it + 1] } argsWoHeader.forEach { execute(it) } } fun execute(single_line: String) { - (Terrarum.ingame!!.consoleHandler as ConsoleWindow).sendMessage("$ccR$single_line") + (Terrarum.ingame!!.consoleHandler).sendMessage("$ccR$single_line") } operator fun invoke(args: Array) = execute(args) diff --git a/src/net/torvald/terrarum/imagefont/TinyAlphNum.kt b/src/net/torvald/terrarum/imagefont/TinyAlphNum.kt index f1e41f86d..7a18859f3 100644 --- a/src/net/torvald/terrarum/imagefont/TinyAlphNum.kt +++ b/src/net/torvald/terrarum/imagefont/TinyAlphNum.kt @@ -89,10 +89,10 @@ object TinyAlphNum : BitmapFont() { if (colourBuffer.containsKey(codePoint)) return colourBuffer[codePoint]!! - val r = codePoint.and(0xF000).ushr(12) - val g = codePoint.and(0x0F00).ushr(8) - val b = codePoint.and(0x00F0).ushr(4) - val a = codePoint.and(0x000F) + val a = codePoint.and(0xF000).ushr(12) + val r = codePoint.and(0x0F00).ushr(8) + val g = codePoint.and(0x00F0).ushr(4) + val b = codePoint.and(0x000F) val col = Color(r.shl(28) or r.shl(24) or g.shl(20) or g.shl(16) or b.shl(12) or b.shl(8) or a.shl(4) or a)