[Scummvm-git-logs] scummvm master -> 7b0f5dbac32c9618f1e10ce85eb53d110745bffc

dreammaster noreply at scummvm.org
Sun Feb 4 01:15:57 UTC 2024


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:
7b0f5dbac3 M4: Fixes for Vera and Burl in the diner


Commit: 7b0f5dbac32c9618f1e10ce85eb53d110745bffc
    https://github.com/scummvm/scummvm/commit/7b0f5dbac32c9618f1e10ce85eb53d110745bffc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-03T17:15:34-08:00

Commit Message:
M4: Fixes for Vera and Burl in the diner

Changed paths:
    engines/m4/burger/rooms/section1/room143.cpp


diff --git a/engines/m4/burger/rooms/section1/room143.cpp b/engines/m4/burger/rooms/section1/room143.cpp
index d99ed1aa928..32a275bc317 100644
--- a/engines/m4/burger/rooms/section1/room143.cpp
+++ b/engines/m4/burger/rooms/section1/room143.cpp
@@ -969,7 +969,7 @@ void Room143::daemon() {
 					Series::series_play("143bu19", 0xa00, 0, kCHANGE_BURL_ANIMATION, 8, 0, 100, 0, 0, frame, frame);
 
 				} else if (imath_ranged_rand(1, 30) == 1) {
-					Series::series_play("143bu19", 0xa00, 0, -1, 8, 0, 100, 0, 0, 6, 12);
+					Series::series_play("143bu19", 0xa00, 0, kCHANGE_BURL_ANIMATION, 8, 0, 100, 0, 0, 6, 12);
 				} else {
 					do {
 						if (_frame >= 5)
@@ -1317,7 +1317,7 @@ void Room143::conv35() {
 			if ((node == 9 && entry == 1) || (node == 5 && entry == 1) ||
 					(node == 17 && entry == 0) || (node == 19 && entry == 0)) {
 				terminateMachineAndNull(_eu02);
-				series_play("14eu02", 0xf00, 2, -1, 4, 0, 100, 0, 0, 0, 3);
+				series_play("143eu02", 0xf00, 2, -1, 4, 0, 100, 0, 0, 0, 3);
 			}
 
 			if (node == 11 && entry == 0) {
@@ -1343,7 +1343,7 @@ void Room143::conv35() {
 			} else {
 				_veraShould = 8;
 				if (_veraMode != 13) {
-					_G(kernel).trigger = KT_DAEMON;
+					_G(kernel).trigger_mode = KT_DAEMON;
 					kernel_trigger_dispatch_now(kCHANGE_VERA_ANIMATION);
 				}
 			}




More information about the Scummvm-git-logs mailing list