[Scummvm-git-logs] scummvm master -> 2232f3f3ff131be4b15f46c6fd1b372338dcc032

[dreammaster]

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:
2087b9a39f AGS: Janitorial
2232f3f3ff AGS: Fix rendering accented characters in Gemini Rue German


Commit: 2087b9a39fd1e5f4c6619feb9db213c9279604c5
    https://github.com/scummvm/scummvm/commit/2087b9a39fd1e5f4c6619feb9db213c9279604c5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-07T16:21:25-07:00

Commit Message:
AGS: Janitorial

Changed paths:
    engines/ags/lib/alfont/alfont.h


diff --git a/engines/ags/lib/alfont/alfont.h b/engines/ags/lib/alfont/alfont.h
index 852e52bd31..b63a9562d9 100644
--- a/engines/ags/lib/alfont/alfont.h
+++ b/engines/ags/lib/alfont/alfont.h
@@ -31,20 +31,20 @@
 namespace AGS3 {
 
 struct ALFONT_FONT {
-Common::MemoryReadStream _ttfData;
-int _size;
-Common::HashMap<int, Graphics::Font *> _fonts;
+	Common::MemoryReadStream _ttfData;
+	int _size;
+	Common::HashMap<int, Graphics::Font *> _fonts;
 
-ALFONT_FONT() : _size(-1), _ttfData(nullptr, 0) {}
-ALFONT_FONT(const byte *data, int size) : _size(-1), _ttfData(data, size, DisposeAfterUse::YES) {}
+	ALFONT_FONT() : _size(-1), _ttfData(nullptr, 0) {}
+	ALFONT_FONT(const byte *data, int size) : _size(-1), _ttfData(data, size, DisposeAfterUse::YES) {}
 
-~ALFONT_FONT() {
-	for (Common::HashMap<int, Graphics::Font *>::iterator it = _fonts.begin();
-	        it != _fonts.end(); ++it)
-		delete(*it)._value;
-}
+	~ALFONT_FONT() {
+		for (Common::HashMap<int, Graphics::Font *>::iterator it = _fonts.begin();
+				it != _fonts.end(); ++it)
+			delete(*it)._value;
+	}
 
-Graphics::Font *getFont();
+	Graphics::Font *getFont();
 };
 
 inline void alfont_init() {}


Commit: 2232f3f3ff131be4b15f46c6fd1b372338dcc032
    https://github.com/scummvm/scummvm/commit/2232f3f3ff131be4b15f46c6fd1b372338dcc032
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-07T16:21:25-07:00

Commit Message:
AGS: Fix rendering accented characters in Gemini Rue German

Changed paths:
    engines/ags/lib/alfont/alfont.cpp


diff --git a/engines/ags/lib/alfont/alfont.cpp b/engines/ags/lib/alfont/alfont.cpp
index 2efe207a04..1f635815cd 100644
--- a/engines/ags/lib/alfont/alfont.cpp
+++ b/engines/ags/lib/alfont/alfont.cpp
@@ -34,10 +34,7 @@ Graphics::Font *ALFONT_FONT::getFont() {
 #ifdef USE_FREETYPE2
 	if (!_fonts.contains(_size)) {
 		// Instantiate the raw TTF data into a font of the given size
-		Graphics::TTFRenderMode renderMode = Graphics::kTTFRenderModeMonochrome;
-		if (ShouldAntiAliasText())
-			renderMode = Graphics::kTTFRenderModeLight;
-		_fonts[_size] = Graphics::loadTTFFont(_ttfData, _size, Graphics::kTTFSizeModeCharacter, 0, renderMode);
+		_fonts[_size] = Graphics::loadTTFFont(_ttfData, _size);
 		assert(_fonts[_size]);
 	}