KOTOR: Replace fnt_d16x16 with fnt_d16x16b for all widgets

xoreos · May 26, 2018 · 950d7c7 · 950d7c7
1 parent 1c635e0
commit 950d7c7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/engines/kotor/gui/chargen/chargenname.cpp b/src/engines/kotor/gui/chargen/chargenname.cpp
@@ -42,7 +42,6 @@ CharacterGenerationNameMenu::CharacterGenerationNameMenu(CharacterGenerationInfo
 	addBackground(kBackgroundTypeMenu);
 
 	_nameLabel = getLabel("NAME_BOX_EDIT");
-	_nameLabel->setFont("fnt_d16x16b");
 	_nameLabel->setText("_");
 
 	EventMan.enableTextInput(true);

diff --git a/src/engines/kotor/gui/dialog.cpp b/src/engines/kotor/gui/dialog.cpp
@@ -61,7 +61,6 @@ DialogGUI::DialogGUI(bool k2)
 	lblMessage->setSize(w, rh);
 	lblMessage->setHorizontalTextAlign(Graphics::Aurora::kHAlignCenter);
 	lblMessage->setVerticalTextAlign(Graphics::Aurora::kVAlignBottom);
-	lblMessage->setFont("fnt_d16x16b");
 
 	WidgetListBox *lbReplies = getListBox("LB_REPLIES");
 	lbReplies->setItemSelectionEnabled(true);
@@ -75,7 +74,6 @@ DialogGUI::DialogGUI(bool k2)
 			++it) {
 		WidgetLabel *label = static_cast<WidgetLabel *>(*it);
 		label->enableHighlight();
-		label->setFont("fnt_d16x16b");
 		addWidget(label);
 	}
 }

diff --git a/src/engines/kotor/gui/widgets/kotorwidget.cpp b/src/engines/kotor/gui/widgets/kotorwidget.cpp
@@ -356,6 +356,10 @@ void KotORWidget::load(const Aurora::GFF3Struct &gff) {
 	Text text = createText(gff);
 
 	if (!text.font.empty()) {
+		// Font "fnt_d16x16" in KotOR is broken, replace it with
+		// "fnt_d16x16b" which is otherwise identical
+		if (text.font == "fnt_d16x16")
+			text.font = "fnt_d16x16b";
 		// Buttons in Jade are too small for their text
 		// If widget height is less than the font needs
 		// increase to font height and reposition