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

[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:
c774826dcd AGS: Added hack for fixing La Croix Pan help dialog


Commit: c774826dcdc4cb59288f37c208cb74a0d6fe3e20
    https://github.com/scummvm/scummvm/commit/c774826dcdc4cb59288f37c208cb74a0d6fe3e20
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-07-02T21:54:47-07:00

Commit Message:
AGS: Added hack for fixing La Croix Pan help dialog

Changed paths:
    engines/ags/engine/ac/display.cpp


diff --git a/engines/ags/engine/ac/display.cpp b/engines/ags/engine/ac/display.cpp
index 169a9307ee..362e14f2e5 100644
--- a/engines/ags/engine/ac/display.cpp
+++ b/engines/ags/engine/ac/display.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/config-manager.h"
 #include "ags/lib/std/algorithm.h"
 #include "ags/lib/std/math.h"
 #include "ags/engine/ac/display.h"
@@ -86,6 +87,12 @@ int _display_main(int xx, int yy, int wii, const char *text, int disp_type, int
 	int paddingScaled = get_fixed_pixel_size(padding);
 	int paddingDoubledScaled = get_fixed_pixel_size(padding * 2); // Just in case screen size does is not neatly divisible by 320x200
 
+	// FIXME: Fixes the display of the F1 help dialog in La Croix Pan,
+	// since it was previously incorrectly wrapping on the 's' at the end
+	// of the 'Cursors' word. May be due to minor differences in width calcs
+	if (padding == 3 && ConfMan.get("gameid") == "lacroixpan")
+		padding = 0;
+
 	ensure_text_valid_for_font(todis, usingfont);
 	break_up_text_into_lines(todis, Lines, wii - 2 * padding, usingfont);
 	disp.lineheight = getfontheight_outlined(usingfont);