[Scummvm-git-logs] scummvm branch-2-6 -> ff94186e40fb8e8bb7d1800ead21c207d17ba15b

dreammaster noreply at scummvm.org
Sun Jun 19 19:19:26 UTC 2022


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:
ff94186e40 CHEWY: Fix endless loop at start of room 0 feeding


Commit: ff94186e40fb8e8bb7d1800ead21c207d17ba15b
    https://github.com/scummvm/scummvm/commit/ff94186e40fb8e8bb7d1800ead21c207d17ba15b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-06-19T12:19:11-07:00

Commit Message:
CHEWY: Fix endless loop at start of room 0 feeding

Changed paths:
    engines/chewy/rooms/room00.cpp


diff --git a/engines/chewy/rooms/room00.cpp b/engines/chewy/rooms/room00.cpp
index 9f3242390e3..2e5a9e54618 100644
--- a/engines/chewy/rooms/room00.cpp
+++ b/engines/chewy/rooms/room00.cpp
@@ -74,7 +74,7 @@ bool Room0::timer(int16 timerNr, int16 aniNr) {
 		if (_G(timer_action_ctr) > 0) {
 			_G(uhr)->resetTimer(timerNr, 0);
 			--_G(timer_action_ctr);
-		} else if (!is_chewy_busy()) {
+		} else if (!is_chewy_busy() && _G(flags).AutoAniPlay == 0) {
 			if (!_G(gameState).R0FueterLab)
 				_G(timer_action_ctr) = 2;
 




More information about the Scummvm-git-logs mailing list