[Scummvm-git-logs] scummvm master -> 436a2cf76003ab5a7ddfd3c9cb46523314962378

[OMGPizzaGuy]

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

Summary:
5b837a49ab ULTIMA8: Move the game resolution options to ConfigManager
436a2cf760 ULTIMA8: Improve font rendering with "ttf_antialiasing=false" through use of Graphics::kTTFRenderModeMonochrome


Commit: 5b837a49ab86113de636c55b1f5628c34260284b
    https://github.com/scummvm/scummvm/commit/5b837a49ab86113de636c55b1f5628c34260284b
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-01-31T13:03:22-06:00

Commit Message:
ULTIMA8: Move the game resolution options to ConfigManager

Changed paths:
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 7d16975c7a..8668685423 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -599,18 +599,17 @@ void Ultima8Engine::paint() {
 
 void Ultima8Engine::GraphicSysInit() {
 	if (GAME_IS_U8) {
-		_settingMan->setDefault("width", U8_DEFAULT_SCREEN_WIDTH);
-		_settingMan->setDefault("height", U8_DEFAULT_SCREEN_HEIGHT);
+		ConfMan.registerDefault("width", U8_DEFAULT_SCREEN_WIDTH);
+		ConfMan.registerDefault("height", U8_DEFAULT_SCREEN_HEIGHT);
 	} else {
-		_settingMan->setDefault("width", CRUSADER_DEFAULT_SCREEN_WIDTH);
-		_settingMan->setDefault("height", CRUSADER_DEFAULT_SCREEN_HEIGHT);
+		ConfMan.registerDefault("width", CRUSADER_DEFAULT_SCREEN_WIDTH);
+		ConfMan.registerDefault("height", CRUSADER_DEFAULT_SCREEN_HEIGHT);
 	}
-	_settingMan->setDefault("bpp", 16);
+	ConfMan.registerDefault("bpp", 16);
 
-	int width, height, bpp;
-	_settingMan->get("width", width);
-	_settingMan->get("height", height);
-	_settingMan->get("bpp", bpp);
+	int width = ConfMan.getInt("width");
+	int height = ConfMan.getInt("height");
+	int bpp = ConfMan.getInt("bpp");
 
 	if (_screen) {
 		Rect old_dims;


Commit: 436a2cf76003ab5a7ddfd3c9cb46523314962378
    https://github.com/scummvm/scummvm/commit/436a2cf76003ab5a7ddfd3c9cb46523314962378
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-01-31T13:03:22-06:00

Commit Message:
ULTIMA8: Improve font rendering with "ttf_antialiasing=false" through use of Graphics::kTTFRenderModeMonochrome

Changed paths:
    engines/ultima/ultima8/graphics/fonts/font_manager.cpp


diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
index e6ecaf0ae8..acab2b0418 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
@@ -109,7 +109,8 @@ Graphics::Font *FontManager::getTTF_Font(const Std::string &filename, int points
 #ifdef USE_FREETYPE2
 	// open font using ScummVM TTF API
 	// Note: The RWops and ReadStream will be deleted by the TTF_Font
-	Graphics::Font *font = Graphics::loadTTFFont(*fontids, pointsize);
+	Graphics::TTFRenderMode mode = _ttfAntialiasing ? Graphics::kTTFRenderModeNormal : Graphics::kTTFRenderModeMonochrome;
+	Graphics::Font *font = Graphics::loadTTFFont(*fontids, pointsize, Graphics::kTTFSizeModeCharacter, 0, mode, 0, false);
 
 	if (!font) {
 		perr << "Failed to open TTF: @data/" << filename << Std::endl;