Fix exult#650.

The help scrolls' display on SI were broken with 290c278

Author: DominusExult

audio/soundtest.cc

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000-2022 The Exult Team
+ *  Copyright (C) 2000-2025 The Exult Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -74,6 +74,7 @@ void SoundTester::test_sound() {
 	do {
 		if (redraw) {
 			Scroll_gump scroll;
+			scroll.set_from_help(true);
 			scroll.add_text(" ~");
 			scroll.paint();
 			// Update our repeat flag to match the player if it is playing out

gumps/Text_gump.cc

@@ -40,7 +40,8 @@ void Text_gump::add_text(const char* str) {
 		newtext = text;
 		if (newtext[textlen - 1] != '*') {
 			// Scrolls in SI break page with embedded 0x00
-			if (GAME_SI && get_shapenum() == game->get_shape("gumps/scroll")) {
+			if (GAME_SI && get_shapenum() == game->get_shape("gumps/scroll")
+				&& !from_help) {
 				newtext += "*";
 			} else {
 				newtext += "~";
@@ -119,7 +120,8 @@ int Text_gump::paint_page(const TileRect& box, int start) {
 		if (endoff > 0) {
 			// Check for a page‑break marker
 			if (epage && get_shapenum() == game->get_shape("gumps/scroll")) {
-				if (GAME_SI && start == 0 && ypos <= 5 * textheight) {
+				if (GAME_SI && start == 0 && ypos <= 5 * textheight
+					&& !from_help) {
 					// ignore page breaks on the first 5 lines of a scroll
 					str    = pageBreakStar + 1;
 					curend = str - text;

gumps/Text_gump.h

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2000-2022 The Exult Team
+Copyright (C) 2000-2025 The Exult Team
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -26,21 +26,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 class Text_gump : public Gump {
 protected:
-	char* text;       // The text.
-	int   textlen;    // Length of text.
-	int   curtop;     // Offset of top of current page.
-	int   curend;     // Offset past end of current page(s).
-	int   font;       // The shape in fonts.vga to use
+	char* text;         // The text.
+	int   textlen;      // Length of text.
+	int   curtop;       // Offset of top of current page.
+	int   curend;       // Offset past end of current page(s).
+	int   font;         // The shape in fonts.vga to use
+	bool  from_help;    // Text is from help system
 
 public:
 	Text_gump(int shapenum, int fnt = 4)
 			: Gump(nullptr, shapenum), text(nullptr), textlen(0), curtop(0),
-			  curend(0), font(fnt) {}
+			  curend(0), font(fnt), from_help(false) {}
 
 	~Text_gump() override {
 		delete[] text;
 	}
 
+	void set_from_help(bool val) {
+		from_help = val;
+	}
+
 	void add_text(const char* str);    // Append text.
 	int  paint_page(const TileRect& box, int start);
 	// Next page of book/scroll.

keyactions.cc

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2001-2024 The Exult Team
+ *  Copyright (C) 2001-2025 The Exult Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -143,6 +143,7 @@ void ActionAbout(const int* params) {
 	Scroll_gump* scroll;
 	scroll = new Scroll_gump();
 
+	scroll->set_from_help(true);
 	// add_text has strange behaviour
 	// \n and ~ both act as a newline with slightly different spacing
 	// it automatically adds a newline if the

keys.cc

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2001-2022 The Exult Team
+ *  Copyright (C) 2001-2025 The Exult Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -479,6 +479,7 @@ void KeyBinder::ShowHelp() const {
 	scroll = new Scroll_gump();
 
 	for (const auto& iter : keyhelp) {
+		scroll->set_from_help(true);
 		scroll->add_text(iter.c_str());
 	}
 
@@ -497,6 +498,7 @@ void KeyBinder::ShowCheatHelp() const {
 	scroll = new Scroll_gump();
 
 	for (const auto& iter : cheathelp) {
+		scroll->set_from_help(true);
 		scroll->add_text(iter.c_str());
 	}
 
@@ -515,6 +517,7 @@ void KeyBinder::ShowMapeditHelp() const {
 	scroll = new Scroll_gump();
 
 	for (const auto& iter : mapedithelp) {
+		scroll->set_from_help(true);
 		scroll->add_text(iter.c_str());
 	}
 
@@ -530,6 +533,7 @@ void KeyBinder::ShowMapeditHelp() const {
 
 void KeyBinder::ShowBrowserKeys() const {
 	auto* scroll = new Scroll_gump();
+	scroll->set_from_help(true);
 	scroll->add_text("Esc - Exits the shape browser");
 	scroll->add_text("down - Increase shape by 1");
 	scroll->add_text("R - toggle palette rotation");