[Scummvm-git-logs] scummvm master -> 5ff5d582890b1153cacd6e2d7c536341b51c8e7d

[sluicebox]

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

Summary:
5ff5d58289 AGI: Use clear.lines color in text mode on Amiga


Commit: 5ff5d582890b1153cacd6e2d7c536341b51c8e7d
    https://github.com/scummvm/scummvm/commit/5ff5d582890b1153cacd6e2d7c536341b51c8e7d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-10-15T15:36:18-07:00

Commit Message:
AGI: Use clear.lines color in text mode on Amiga

Fixes help screen in Amiga Donald Duck's Playground, bug #16246

Changed paths:
    engines/agi/op_cmd.cpp


diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 464e19709f7..a241f00f9c8 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -2172,7 +2172,17 @@ void cmdToggleMonitor(AgiGame *state, AgiEngine *vm, uint8 *parameter) {
 void cmdClearLines(AgiGame *state, AgiEngine *vm, uint8 *parameter) {
 	int16 textRowUpper = parameter[0];
 	int16 textRowLower = parameter[1];
-	int16 color = vm->_text->calculateTextBackground(parameter[2]);
+	int16 color;
+	if (!vm->_game.gfxMode && vm->getPlatform() == Common::kPlatformAmiga) {
+		// The Amiga interpreter respected the color parameter in clear.lines
+		// while in text mode. Other platforms ignored it and used black.
+		// Amiga DDP sets a white background for its help screen, bug #16246.
+		// This logic could go in calculateTextBackground(), but it is called
+		// by other places in our code so that could cause side effects.
+		color = parameter[2];
+	} else {
+		color = vm->_text->calculateTextBackground(parameter[2]);
+	}
 
 	// Residence 44 calls clear.lines(24,0,0), see Sarien bug #558423
 	// Agent06 incorrectly calls clear.lines(1,150,0), see ScummVM bugs