[Scummvm-git-logs] scummvm master -> 836533b2a93c05379459252ec63f629cf62c8a18

[bluegr]

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:
836533b2a9 AGI: PREAGI: Fix Winnie the Pooh game loop


Commit: 836533b2a93c05379459252ec63f629cf62c8a18
    https://github.com/scummvm/scummvm/commit/836533b2a93c05379459252ec63f629cf62c8a18
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-11-10T21:29:54+02:00

Commit Message:
AGI: PREAGI: Fix Winnie the Pooh game loop

- Fixes repeating Eeyore menu, bug #15472
- Fixes menu selections having no effect
- Fixes displaying messages for the wrong room

Changed paths:
    engines/agi/preagi/winnie.cpp


diff --git a/engines/agi/preagi/winnie.cpp b/engines/agi/preagi/winnie.cpp
index 489cb3ee4dc..039ae263e07 100644
--- a/engines/agi/preagi/winnie.cpp
+++ b/engines/agi/preagi/winnie.cpp
@@ -1047,10 +1047,12 @@ void WinnieEngine::gameLoop() {
 
 		if (decodePhase == 3) {
 			for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
-				if (parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_GOTO) {
+				int result = parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata);
+				if (result == IDI_WTP_PAR_GOTO) {
 					decodePhase = 0;
 					break;
-				} else if (parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_BACK) {
+				}
+				if (result == IDI_WTP_PAR_BACK) {
 					decodePhase = 2;
 					break;
 				}