libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 09:26:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

M4: Fix for barber conversation

Browse Source
This commit is contained in:
Paul Gilbert 2024-02-23 21:17:31 -08:00
parent 9152c3dc4e
commit 4f61f5af6d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/m4/burger/rooms/section1/room102.cpp
View File

@ -185,8 +185,6 @@ void Room102::daemon() {
break; break;
case kCHANGE_HARRY_ANIMATION: case kCHANGE_HARRY_ANIMATION:
warning("%d - %d", _harryMode, _harryShould);
switch (_harryShould) { switch (_harryShould) {
case 19: case 19:
term_message(" mumble or change channel"); term_message(" mumble or change channel");
@ -1629,7 +1627,7 @@ void Room102::conv06() {
if (who <= 0) { if (who <= 0) {
if (node == 2) { if (node == 2) {
_harryMode = 19; _harryMode = 19;
_G(kernel).trigger_mode = KT_PARSE; _G(kernel).trigger_mode = KT_DAEMON;
kernel_trigger_dispatch_now(kCHANGE_HARRY_ANIMATION); kernel_trigger_dispatch_now(kCHANGE_HARRY_ANIMATION);
} else if (node == 1 && entry == 4) { } else if (node == 1 && entry == 4) {
_G(flags)[V014] = 1; _G(flags)[V014] = 1;
@ -1664,6 +1662,8 @@ void Room102::conv06() {
term_message("gonna_say_sheepdog %d %d", _harryShould, _harryMode); term_message("gonna_say_sheepdog %d %d", _harryShould, _harryMode);
queuePlay(sound, 22, KT_PARSE); queuePlay(sound, 22, KT_PARSE);
_flag1 = true; _flag1 = true;
return;
} else if (node == 1 && entry == 1) { } else if (node == 1 && entry == 1) {
_G(flags)[GLB_TEMP_4] = 1; _G(flags)[GLB_TEMP_4] = 1;
_G(flags)[V001] -= 8; _G(flags)[V001] -= 8;
@ -1686,6 +1686,8 @@ void Room102::conv06() {
} else if (who == 1) { } else if (who == 1) {
if (_wilburChairMode == 64) { if (_wilburChairMode == 64) {
kernel_timing_trigger(30, 7); kernel_timing_trigger(30, 7);
return;
} else { } else {
_wilburChairShould = 60; _wilburChairShould = 60;
_G(kernel).trigger_mode = KT_DAEMON; _G(kernel).trigger_mode = KT_DAEMON;

1
engines/m4/burger/rooms/section4/room405.cpp
View File

@ -423,7 +423,6 @@ void Room405::daemon() {
break; break;
case kCHANGE_VERA_ANIMATION: case kCHANGE_VERA_ANIMATION:
warning("%d %d", _veraMode, _veraShould);
switch (_veraMode) { switch (_veraMode) {
case 4: case 4:
switch (_veraShould) { switch (_veraShould) {