[Scummvm-git-logs] scummvm master -> 712d6ce6e73737668fc2f3accd15d3743818ec13
dreammaster
noreply at scummvm.org
Wed Feb 7 06:00:31 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:
712d6ce6e7 M4: Vera fixes in test 5
Commit: 712d6ce6e73737668fc2f3accd15d3743818ec13
https://github.com/scummvm/scummvm/commit/712d6ce6e73737668fc2f3accd15d3743818ec13
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-06T21:57:14-08:00
Commit Message:
M4: Vera fixes in test 5
Changed paths:
engines/m4/burger/rooms/section4/room405.cpp
diff --git a/engines/m4/burger/rooms/section4/room405.cpp b/engines/m4/burger/rooms/section4/room405.cpp
index d89a37b9bd6..48a21315ccc 100644
--- a/engines/m4/burger/rooms/section4/room405.cpp
+++ b/engines/m4/burger/rooms/section4/room405.cpp
@@ -242,6 +242,10 @@ void Room405::daemon() {
_series1 = nullptr;
break;
+ case 12:
+ conv_resume_curr();
+ break;
+
case 13:
digi_play("405v513", 1, 255);
break;
@@ -419,6 +423,7 @@ void Room405::daemon() {
break;
case kCHANGE_VERA_ANIMATION:
+ warning("%d %d", _veraMode, _veraShould);
switch (_veraMode) {
case 4:
switch (_veraShould) {
@@ -532,7 +537,7 @@ void Room405::daemon() {
series_play_with_breaks(PLAY2, "405ve16", 0x100, kCHANGE_VERA_ANIMATION, 3);
break;
- case 17:
+ case 15:
_veraShould = 9;
kernel_trigger_dispatch_now(kCHANGE_VERA_ANIMATION);
break;
@@ -542,6 +547,9 @@ void Room405::daemon() {
Series::series_play("405ve15", 0xf00, 2, kCHANGE_VERA_ANIMATION, 6, 0, 100, 0, 0, 0, 4);
break;
+ case 24:
+ break;
+
default:
_veraMode = 4;
Series::series_play("405ve08", 0xf00, 2, kCHANGE_VERA_ANIMATION, 6, 0, 100, 0, 0, 0, 4);
@@ -668,6 +676,7 @@ void Room405::daemon() {
break;
default:
+ _veraMode = 16;
Series::series_play("405ve11", 0xf00, 2, kCHANGE_VERA_ANIMATION, 6, 0, 100, 0, 0, 2, 4);
break;
}
More information about the Scummvm-git-logs
mailing list