mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-22 12:38:12 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced font references with a single reference

Browse Source
This commit is contained in:
Collin Smith 2019-03-04 21:11:53 -08:00
parent b8ba0f17b8
commit 4f0e4f0ccb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/gdx/diablo/widget/NpcDialogBox.java
View File

@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.math.NumberUtils;
import gdx.diablo.Diablo; import gdx.diablo.Diablo;
import gdx.diablo.codec.FontTBL;
import gdx.diablo.graphics.BorderedPaletteIndexedDrawable; import gdx.diablo.graphics.BorderedPaletteIndexedDrawable;
public class NpcDialogBox extends Table { public class NpcDialogBox extends Table {
@ -26,12 +27,13 @@ public class NpcDialogBox extends Table {
// FIXME: scrollSpeed should be in pixels/sec, but timing is off by about 10-15% // FIXME: scrollSpeed should be in pixels/sec, but timing is off by about 10-15%
// problem seems to be with fontformat11 metrics, applying scalar to line height // problem seems to be with fontformat11 metrics, applying scalar to line height
final float lineScalar = 0.85f; final float lineScalar = 0.85f;
final FontTBL.BitmapFont FONT = Diablo.fonts.fontformal11;
String text = Diablo.string.lookup(key); String text = Diablo.string.lookup(key);
String[] parts = text.split("\n", 2); String[] parts = text.split("\n", 2);
scrollSpeed = NumberUtils.toFloat(parts[0]) / 60 * Diablo.fonts.fontformal11.getLineHeight() * lineScalar; scrollSpeed = NumberUtils.toFloat(parts[0]) / 60 * FONT.getLineHeight() * lineScalar;
final int count = StringUtils.countMatches(parts[1], '\n'); final int count = StringUtils.countMatches(parts[1], '\n');
textArea = new TextArea(parts[1], new TextArea.TextFieldStyle() {{ textArea = new TextArea(parts[1], new TextArea.TextFieldStyle() {{
font = Diablo.fonts.fontformal11; font = FONT;
fontColor = Diablo.colors.white; fontColor = Diablo.colors.white;
}}) { }}) {
final float prefHeight = count * getStyle().font.getLineHeight(); final float prefHeight = count * getStyle().font.getLineHeight();