[Scummvm-git-logs] scummvm master -> f556ba3fc9bde8e3837542dbca813e629d07fa0f

[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:
f556ba3fc9 AGS: Startup fixes for Kathy Rain


Commit: f556ba3fc9bde8e3837542dbca813e629d07fa0f
    https://github.com/scummvm/scummvm/commit/f556ba3fc9bde8e3837542dbca813e629d07fa0f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-02-20T15:22:24-08:00

Commit Message:
AGS: Startup fixes for Kathy Rain

Changed paths:
    engines/ags/detection_tables.h
    engines/ags/plugins/ags_sprite_font/ags_sprite_font.cpp
    engines/ags/plugins/ags_sprite_font/ags_sprite_font.h
    engines/ags/plugins/plugin_base.cpp


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index 686f6b2944..db8235fdd1 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -1657,7 +1657,6 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	DEMO_ENTRY("jamesperis2", "James2.exe", "06a03fe35791b0578068ab1873455463", 35766505),
 	DEMO_ENTRY("jorry", "JORRY DEMO.exe", "fe5f7dc7785b335aec72a2a834629bad", 124667001),
 	DEMO_ENTRY("kathyrain", "kathyrain.exe", "434e24a12ba3cfb07d7b4b2f0e0bb1bf", 197487685), // Steam
-	DEMO_ENTRY("kathyrain", "kathyrain.exe", "d2b1ba151c3d209b50331127032f96f6", 197490245), // GOG 1.04
 	DEMO_ENTRY("kinkyisland", "KINKY.exe", "f120690b506dd63cd7d1112ea6af2f77", 10628479),
 	DEMO_ENTRY("lazytownthenewkid", "newkiddemo1.2.exe", "9cb3c8dc7a8ab9c44815955696be2677", 15515508),
 	DEMO_ENTRY("litnunforgettablememories", "litn_umtechdemo.exe", "f120690b506dd63cd7d1112ea6af2f77", 3507831),
@@ -2197,6 +2196,8 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	GAME_ENTRY("kanjigakusei", "KanjiGakusei.exe", "c1bce0ccfa858f0f5d2fe19997d89b05", 17604764),
 	GAME_ENTRY("kartquest", "Kart.exe", "465f972675db2da6040518221af5b0ba", 77317312),
 	GAME_ENTRY("kathyrain", "kathyrain.exe", "434e24a12ba3cfb07d7b4b2f0e0bb1bf", 197487159), // Steam
+	GAME_ENTRY("kathyrain", "kathyrain.exe", "d2b1ba151c3d209b50331127032f96f6", 197490245), // GOG 1.04
+	GAME_ENTRY("kathyrain", "kathyrain.exe", "d2b1ba151c3d209b50331127032f96f6", 197489719), // GOG
 	GAME_ENTRY("keptoshi", "Keptosh.exe", "95b7dd55f6e15c8a2118856ed9fe8ff9", 2904848),
 	GAME_ENTRY("keys", "Keys.exe", "75f4c7f66b1be60af5b2d65f617b91a7", 85582285),
 	GAME_ENTRY("killereye", "killereye.exe", "0710e2ec71042617f565c01824f0cf3c", 1009042),
diff --git a/engines/ags/plugins/ags_sprite_font/ags_sprite_font.cpp b/engines/ags/plugins/ags_sprite_font/ags_sprite_font.cpp
index 01318e764a..30aa9ca9bf 100644
--- a/engines/ags/plugins/ags_sprite_font/ags_sprite_font.cpp
+++ b/engines/ags/plugins/ags_sprite_font/ags_sprite_font.cpp
@@ -105,6 +105,7 @@ void AGSSpriteFont::AGS_EngineStartup(IAGSEngine *engine) {
 	SCRIPT_METHOD(SetVariableSpriteFont);
 	SCRIPT_METHOD(SetGlyph);
 	SCRIPT_METHOD(SetSpacing);
+	SCRIPT_METHOD(SetLineHeightAdjust);
 }
 
 void AGSSpriteFont::AGS_EngineShutdown() {
@@ -134,6 +135,11 @@ void AGSSpriteFont::SetSpacing(int fontNum, int spacing) {
 	_vWidthRenderer->SetSpacing(fontNum, spacing);
 }
 
+void AGSSpriteFont::SetLineHeightAdjust(int v1, int v2, int v3, int v4) {
+	// TODO
+}
+
+
 } // namespace AGSSpriteFont
 } // namespace Plugins
 } // namespace AGS3
diff --git a/engines/ags/plugins/ags_sprite_font/ags_sprite_font.h b/engines/ags/plugins/ags_sprite_font/ags_sprite_font.h
index 4fad6b3f80..1635eaec4c 100644
--- a/engines/ags/plugins/ags_sprite_font/ags_sprite_font.h
+++ b/engines/ags/plugins/ags_sprite_font/ags_sprite_font.h
@@ -46,6 +46,7 @@ private:
 	static void SetVariableSpriteFont(int fontNum, int sprite);
 	static void SetGlyph(int fontNum, int charNum, int x, int y, int width, int height);
 	static void SetSpacing(int fontNum, int spacing);
+	static void SetLineHeightAdjust(int v1, int v2, int v3, int v4);
 
 public:
 	AGSSpriteFont();
diff --git a/engines/ags/plugins/plugin_base.cpp b/engines/ags/plugins/plugin_base.cpp
index e9e478d147..00c3f33292 100644
--- a/engines/ags/plugins/plugin_base.cpp
+++ b/engines/ags/plugins/plugin_base.cpp
@@ -73,7 +73,7 @@ void *pluginOpen(const char *filename) {
 	if (fname.equalsIgnoreCase("AGSSnowRain") || fname.equalsIgnoreCase("ags_snowrain"))
 		return new AGSSnowRain::AGSSnowRain();
 
-	if (fname.equalsIgnoreCase("AGSSpriteFont"))
+	if (fname.equalsIgnoreCase("AGSSpriteFont") || fname.equalsIgnoreCase("agsplugin.spritefont"))
 		return new AGSSpriteFont::AGSSpriteFont();
 
 	if (fname.equalsIgnoreCase("agsgalaxy") || fname.equalsIgnoreCase("agsgalaxy-unified") ||