[Scummvm-git-logs] scummvm master -> 1a4ce03bc5b322316e3d13682d85d592ffb0a916

shkupfer noreply at scummvm.org
Sun Apr 30 00:36:26 UTC 2023


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:
1a4ce03bc5 SCUMM HE: Also return forced=0 when ball not bounced (#4956)


Commit: 1a4ce03bc5b322316e3d13682d85d592ffb0a916
    https://github.com/scummvm/scummvm/commit/1a4ce03bc5b322316e3d13682d85d592ffb0a916
Author: shkupfer (shkupf at gmail.com)
Date: 2023-04-29T20:36:22-04:00

Commit Message:
SCUMM HE: Also return forced=0 when ball not bounced (#4956)

Co-authored-by: shkupfer <shkupfer at ncsu.edu>

Changed paths:
    engines/scumm/he/script_v72he.cpp


diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index f0215e272dc..80c99d58369 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -185,7 +185,6 @@ int ScummEngine_v72he::readArray(int array, int idx2, int idx1) {
 			readVar(399) == 1 &&  // This checks that we're playing online
 			readVar(0x8000 + 11) == 1 &&  // The ball is a pop-up
 			readVar(291) < 2 &&  // Less than two outs
-			readVar(300) == 0 &&  // Ball hasn't bounced
 			// This is the array of baserunner status info, and the value in position 8 specifies whether the runner is forced
 			array == 295 && idx1 == 8) {
 			return 0;




More information about the Scummvm-git-logs mailing list