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

[dreammaster]

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

Summary:
cf860e4509 MADS: FOREST: Fix crash opening journal
f7283b94af MADS: FOREST: Hotspot text is not supported in this game


Commit: cf860e45099a85c6ad7875b78c45b10b8acfbdaf
    https://github.com/scummvm/scummvm/commit/cf860e45099a85c6ad7875b78c45b10b8acfbdaf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-06-23T14:00:41+10:00

Commit Message:
MADS: FOREST: Fix crash opening journal

Changed paths:
    engines/mads/madsv2/forest/journal.cpp


diff --git a/engines/mads/madsv2/forest/journal.cpp b/engines/mads/madsv2/forest/journal.cpp
index a3e152e4b38..fe2fe02b8e5 100644
--- a/engines/mads/madsv2/forest/journal.cpp
+++ b/engines/mads/madsv2/forest/journal.cpp
@@ -75,9 +75,9 @@ void open_journal(int mode) {
 
 		if (mode == 1) {
 			if (count != 23) {
-				int id = count * 2 + 46;
+				int x = count * 2 + 46;
 				int clip_x = 100 - count * 9;
-				sprite_draw_clipped(series_list[0], id, clip_x, &scr_inter, 1, 30);
+				sprite_draw_clipped(series_list[0], 1, clip_x, &scr_inter, x, 30);
 			}
 		} else {
 			sprite_draw(series_list[0], 3, &scr_inter, 1, 8);
@@ -85,9 +85,9 @@ void open_journal(int mode) {
 
 		if (mode == 2) {
 			if (count != 23) {
-				int id = count * 2 + 40;
+				int x = count * 2 + 40;
 				int clip_x = 100 - count * 9;
-				sprite_draw_clipped(series_list[1], id, clip_x, &scr_inter, 1, 96);
+				sprite_draw_clipped(series_list[1], 1, clip_x, &scr_inter, x, 96);
 			}
 		} else {
 			sprite_draw(series_list[1], 1, &scr_inter, 1, 68);
@@ -136,9 +136,9 @@ void close_journal(int mode) {
 
 		if (mode == 1) {
 			if (count != 0) {
-				int id = count * 2 + 43;
+				int x = count * 2 + 43;
 				int clip_x = 100 - count * 9;
-				sprite_draw_clipped(series_list[0], id, clip_x, &scr_inter, 1, 30);
+				sprite_draw_clipped(series_list[0], 1, clip_x, &scr_inter, x, 30);
 			} else {
 				sprite_draw(series_list[0], 3, &scr_inter, 1, 8);
 			}
@@ -148,9 +148,9 @@ void close_journal(int mode) {
 
 		if (mode == 2) {
 			if (count != 0) {
-				int id = count * 2 + 37;
+				int x = count * 2 + 37;
 				int clip_x = 100 - count * 9;
-				sprite_draw_clipped(series_list[1], id, clip_x, &scr_inter, 1, 96);
+				sprite_draw_clipped(series_list[1], 1, clip_x, &scr_inter, x, 96);
 			} else {
 				sprite_draw(series_list[1], 1, &scr_inter, 1, 68);
 			}


Commit: f7283b94af9641d20a9a54cfe0cc127c50a98b64
    https://github.com/scummvm/scummvm/commit/f7283b94af9641d20a9a54cfe0cc127c50a98b64
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-06-23T14:00:42+10:00

Commit Message:
MADS: FOREST: Hotspot text is not supported in this game

Interestingly, they chose to disable it by commenting out the line
in inter_main_loop that adds the hotspot text onto the screen, but
left in place the code that builds up the inter_sentence text
unchanged, along with a command line flag for whether to show
hotspots when hovering.

Until I realized it was completely disabled, I was getting some
pretty funky hotspot text. The journal, for example, would show
"Exit Journal exit journal". And room exit hotspots in a test room
were showing as "Exit to 106". This may be indicative that they
used the hotspot text for debugging purposes during development.

Changed paths:
    engines/mads/madsv2/core/inter.cpp


diff --git a/engines/mads/madsv2/core/inter.cpp b/engines/mads/madsv2/core/inter.cpp
index 246b40aac58..38701b35398 100644
--- a/engines/mads/madsv2/core/inter.cpp
+++ b/engines/mads/madsv2/core/inter.cpp
@@ -2096,7 +2096,8 @@ void inter_main_loop(int allow_input) {
 			matte_clear_message(inter_sentence_handle);
 			inter_sentence_handle = -1;
 		}
-		if ((strlen(inter_sentence) > 0) && ((inter_input_mode == INTER_BUILDING_SENTENCES) || (inter_input_mode == INTER_LIMITED_SENTENCES))) {
+		if (g_engine->getGameID() != GType_Forest && (strlen(inter_sentence) > 0) &&
+				((inter_input_mode == INTER_BUILDING_SENTENCES) || (inter_input_mode == INTER_LIMITED_SENTENCES))) {
 			use_font = font_main;
 			use_spacing = -1;
 			width = font_string_width(use_font, inter_sentence, use_spacing);