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

[bluegr]

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

Summary:
e0b61f1ec3 SCUMM: Fixed regression caused by Pete Workaround
f9b741c0ee SCUMM: Add comments describing the room variables.


Commit: e0b61f1ec380b72b57abedfc3897642c546087cc
    https://github.com/scummvm/scummvm/commit/e0b61f1ec380b72b57abedfc3897642c546087cc
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2021-04-27T01:03:00+03:00

Commit Message:
SCUMM: Fixed regression caused by Pete Workaround

The original commit containing the Pete Wheeler hotfix for the Baseball gmaes has caused a regression where batting with any other bat as Pete Wheeler would slow down his swinging animation after hitting the ball.  Whoops.  This fixes the regression by adding another check to determine whether he is bunting or not.

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index a7b7202309..c76f5219e3 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1424,7 +1424,7 @@ void ScummEngine_v6::o6_getAnimateVariable() {
 	 		_currentRoom == ((_game.id == GID_BASEBALL2001) ? 4 : 3) && \
 			vm.slot[_currentScript].number == 2105 && \
 			a->_costume == ((_game.id == GID_BASEBALL2001) ? 107 : 99) && \
-			readVar(0x8000 + 5) != 0)
+			readVar(0x8000 + 5) != 0 && readVar(0x8000 + 22) == 4)
 		push(1);
 	else
 		push(a->getAnimVar(var));


Commit: f9b741c0ee44b4033c33d9fae225697a4af0d810
    https://github.com/scummvm/scummvm/commit/f9b741c0ee44b4033c33d9fae225697a4af0d810
Author: Little Cat (toontownlittlecat at gmail.com)
Date: 2021-04-27T01:03:00+03:00

Commit Message:
SCUMM: Add comments describing the room variables.

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index c76f5219e3..3294a735b4 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1424,6 +1424,9 @@ void ScummEngine_v6::o6_getAnimateVariable() {
 	 		_currentRoom == ((_game.id == GID_BASEBALL2001) ? 4 : 3) && \
 			vm.slot[_currentScript].number == 2105 && \
 			a->_costume == ((_game.id == GID_BASEBALL2001) ? 107 : 99) && \
+			// Room variable 5 to ensure this workaround executes only once at
+			// the beginning of the script and room variable 22 to check if we
+			// are bunting.
 			readVar(0x8000 + 5) != 0 && readVar(0x8000 + 22) == 4)
 		push(1);
 	else