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

[dwatteau]

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:
ffab2a2d59 SCUMM: Unbreak V6+ regression of mine


Commit: ffab2a2d599bf0e961f1dbfe6723b024875f9836
    https://github.com/scummvm/scummvm/commit/ffab2a2d599bf0e961f1dbfe6723b024875f9836
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-07-05T11:06:32+02:00

Commit Message:
SCUMM: Unbreak V6+ regression of mine

The revert I did in commit dd5cef0c0f9072ecfd0a3686e7a577be32a9f121 was
incomplete.

(Yesterday, I tried to limit my habit of triple-checking things, and
"letting go".  Looking at the results, I'd rather go back to my usual
process.)

Thanks to Gabberhead for the quick report.

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 63cec73766c..5078badd556 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1702,7 +1702,6 @@ void ScummEngine_v6::o6_loadRoomWithEgo() {
 
 void ScummEngine_v6::o6_getRandomNumber() {
 	int rnd = _rnd.getRandomNumber(0x7fff);
-	int max = pop();
 	rnd = rnd % (pop() + 1);
 	if (VAR_RANDOM_NR != 0xFF)
 		VAR(VAR_RANDOM_NR) = rnd;