[Scummvm-git-logs] scummvm master -> 6dea8fd43dc8fef0966fbe920134986730d715fe

dreammaster dreammaster at scummvm.org
Wed Sep 15 01:54:39 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6dea8fd43d AGS: Fix crash in Time Gentelmen Please


Commit: 6dea8fd43dc8fef0966fbe920134986730d715fe
    https://github.com/scummvm/scummvm/commit/6dea8fd43dc8fef0966fbe920134986730d715fe
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-09-14T18:54:14-07:00

Commit Message:
AGS: Fix crash in Time Gentelmen Please

Changed paths:
    engines/ags/shared/font/ttf_font_renderer.cpp


diff --git a/engines/ags/shared/font/ttf_font_renderer.cpp b/engines/ags/shared/font/ttf_font_renderer.cpp
index dd616d0ffc..9247bb8024 100644
--- a/engines/ags/shared/font/ttf_font_renderer.cpp
+++ b/engines/ags/shared/font/ttf_font_renderer.cpp
@@ -71,8 +71,10 @@ void TTFFontRenderer::RenderText(const char *text, int fontNumber, BITMAP *desti
 	int srcFontNum = get_outline_font(fontNumber);
 	ALFONT_FONT *srcFont = nullptr;
 	if (srcFontNum != FONT_OUTLINE_NONE) {
+		// Get the font without outline (if it's loaded) for use in
+		// character widths, so it will match when non-outlined font
+		// is drawn on top of it.
 		srcFont = _fontData[srcFontNum].AlFont;
-		assert(srcFont);
 	}
 
 	// Y - 1 because it seems to get drawn down a bit




More information about the Scummvm-git-logs mailing list