curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

finally fixed the long-broken colour codes

Browse Source
This commit is contained in:
minjaesong
2021-08-26 16:00:35 +09:00
parent c1cbc13caf
commit 2099213e18
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/console/EchoError.kt
View File

@@ -9,12 +9,12 @@ import net.torvald.terrarum.ui.ConsoleWindow
*/
internal object EchoError : ConsoleCommand {
override fun execute(args: Array<String>) {
val argsWoHeader = Array<String>(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<String>) = execute(args)

8
src/net/torvald/terrarum/imagefont/TinyAlphNum.kt
View File

@@ -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)