AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 19:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-04-14 00:35:23 +02:00
commit d9070d6fb3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala
View File

@ -43,7 +43,7 @@ class DynamicFontRenderer extends TextureFontRenderer with IResourceManagerReloa
textures.clear()
charMap.clear()
textures += new DynamicFontRenderer.CharTexture(this)
activeTexture = textures(0)
activeTexture = textures.head
generateChars(basicChars.toCharArray)
}
@ -69,9 +69,9 @@ class DynamicFontRenderer extends TextureFontRenderer with IResourceManagerReloa
}
override protected def drawChar(tx: Float, ty: Float, char: Char) {
val icon = charMap(char)
if (icon != null && icon.texture == activeTexture) {
icon.draw(tx, ty)
charMap.get(char) match {
case Some(icon) if icon.texture == activeTexture => icon.draw(tx, ty)
case _ =>
}
}