[Scummvm-git-logs] scummvm master -> 36f5fe939e642a1e078cdc9581f7e51a656de353

[dreammaster]

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:
36f5fe939e AGS: Revert load ttf font as outline for ttf font


Commit: 36f5fe939e642a1e078cdc9581f7e51a656de353
    https://github.com/scummvm/scummvm/commit/36f5fe939e642a1e078cdc9581f7e51a656de353
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-09-14T19:33:20-07:00

Commit Message:
AGS: Revert load ttf font as outline for ttf font

This reverts commit d561d865e4574f44b5f15dbaf075505bb1a0c113.

Changed paths:
    engines/ags/shared/ac/game_struct_defines.h
    engines/ags/shared/font/fonts.cpp
    engines/ags/shared/font/fonts.h
    engines/ags/shared/font/ttf_font_renderer.cpp


diff --git a/engines/ags/shared/ac/game_struct_defines.h b/engines/ags/shared/ac/game_struct_defines.h
index c6ca1668d7..d769188c86 100644
--- a/engines/ags/shared/ac/game_struct_defines.h
+++ b/engines/ags/shared/ac/game_struct_defines.h
@@ -226,10 +226,6 @@ struct SpriteInfo {
 	}
 };
 
-// Font renderer flags
-#define FONT_TTF_RENDERER   0x01
-#define FONT_WFN_RENDERER   0x02
-
 // Various font parameters, defining and extending font rendering behavior.
 // While FontRenderer object's main goal is to render single line of text at
 // the strictly determined position on canvas, FontInfo may additionally
@@ -250,23 +246,6 @@ struct FontInfo {
 	int           LineSpacing = 0;
 
 	FontInfo();
-
-	inline bool isTTFFont() const {
-		return (Flags & FONT_TTF_RENDERER) != 0;
-	}
-
-	inline void setTTFFont() {
-		Flags |= FONT_TTF_RENDERER;
-	}
-
-	inline bool isWFNFont() const {
-		return (Flags & FONT_WFN_RENDERER) != 0;
-	}
-
-	inline void setWFNFont() {
-		Flags |= FONT_WFN_RENDERER;
-	}
-
 };
 
 } // namespace AGS3
diff --git a/engines/ags/shared/font/fonts.cpp b/engines/ags/shared/font/fonts.cpp
index 3f9db8cbbf..7f16cf5635 100644
--- a/engines/ags/shared/font/fonts.cpp
+++ b/engines/ags/shared/font/fonts.cpp
@@ -84,7 +84,7 @@ bool font_first_renderer_loaded() {
 }
 
 bool is_font_loaded(size_t fontNumber) {
-	return fontNumber < _GP(fonts).size() && _GP(fonts)[fontNumber].Renderer != nullptr;
+	return fontNumber < _GP(fonts).size() && _GP(fonts)[fontNumber].Renderer != nullptr;;
 }
 
 IAGSFontRenderer *font_replace_renderer(size_t fontNumber, IAGSFontRenderer *renderer) {
@@ -138,9 +138,9 @@ int get_font_outline(size_t font_number) {
 	return _GP(fonts)[font_number].Info.Outline;
 }
 
-int get_outline_ttf_font(size_t font_number) {
+int get_outline_font(size_t font_number) {
 	for (size_t fontNum = 0; fontNum < _GP(fonts).size(); ++fontNum) {
-		if (_GP(fonts)[fontNum].Info.Outline == (int)font_number && _GP(fonts)[fontNum].Info.isTTFFont())
+		if (_GP(fonts)[fontNum].Info.Outline == (int)font_number)
 			return fontNum;
 	}
 
@@ -325,7 +325,6 @@ void set_fontinfo(size_t fontNumber, const FontInfo &finfo) {
 
 // Loads a font from disk
 bool wloadfont_size(size_t fontNumber, const FontInfo &font_info) {
-
 	if (_GP(fonts).size() <= fontNumber)
 		_GP(fonts).resize(fontNumber + 1);
 	else
@@ -336,18 +335,15 @@ bool wloadfont_size(size_t fontNumber, const FontInfo &font_info) {
 	if (_GP(ttfRenderer).LoadFromDiskEx(fontNumber, font_info.SizePt, &params)) {
 		_GP(fonts)[fontNumber].Renderer = &_GP(ttfRenderer);
 		_GP(fonts)[fontNumber].Renderer2 = &_GP(ttfRenderer);
-		_GP(fonts)[fontNumber].Info.setTTFFont();
 	} else if (_GP(wfnRenderer).LoadFromDiskEx(fontNumber, font_info.SizePt, &params)) {
 		_GP(fonts)[fontNumber].Renderer = &_GP(wfnRenderer);
 		_GP(fonts)[fontNumber].Renderer2 = &_GP(wfnRenderer);
-		_GP(fonts)[fontNumber].Info.setWFNFont();
 	}
 
 	if (_GP(fonts)[fontNumber].Renderer) {
 		_GP(fonts)[fontNumber].Info = font_info;
 		return true;
 	}
-
 	return false;
 }
 
diff --git a/engines/ags/shared/font/fonts.h b/engines/ags/shared/font/fonts.h
index b0d8f08d66..5636c02624 100644
--- a/engines/ags/shared/font/fonts.h
+++ b/engines/ags/shared/font/fonts.h
@@ -84,7 +84,7 @@ int getfontlinespacing(size_t fontNumber);
 // Get is font is meant to use default line spacing
 bool use_default_linespacing(size_t fontNumber);
 int  get_font_outline(size_t font_number);
-int  get_outline_ttf_font(size_t font_number);
+int  get_outline_font(size_t font_number);
 void set_font_outline(size_t font_number, int outline_type);
 // Outputs a single line of text on the defined position on bitmap, using defined font, color and parameters
 int getfontlinespacing(size_t fontNumber);
diff --git a/engines/ags/shared/font/ttf_font_renderer.cpp b/engines/ags/shared/font/ttf_font_renderer.cpp
index d8c0cb8380..9247bb8024 100644
--- a/engines/ags/shared/font/ttf_font_renderer.cpp
+++ b/engines/ags/shared/font/ttf_font_renderer.cpp
@@ -68,7 +68,7 @@ void TTFFontRenderer::RenderText(const char *text, int fontNumber, BITMAP *desti
 	if (y > destination->cb)  // optimisation
 		return;
 
-	int srcFontNum = get_outline_ttf_font(fontNumber);
+	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