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

M4: Fix talking to Roxy in test 5

Browse Source
This commit is contained in:
Paul Gilbert 2023-12-27 16:56:34 -10:00
parent f78dde2e68
commit cc1314f9fe
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/m4/burger/rooms/section4/room407.cpp
View File

@ -260,7 +260,7 @@ void Room407::daemon() {
case 5: case 5:
_drumzShould = 17; _drumzShould = 17;
if (_val4) { if (_roxyState) {
kernel_timing_trigger(120, 7); kernel_timing_trigger(120, 7);
} else { } else {
int rnd = imath_ranged_rand(1, 25); int rnd = imath_ranged_rand(1, 25);
@ -367,14 +367,14 @@ void Room407::daemon() {
case kCHANGE_ROXY_ANIMATION: case kCHANGE_ROXY_ANIMATION:
switch (_roxyShould) { switch (_roxyShould) {
case 22: case 22:
_val4 = 0; _roxyState = 0;
_rx = series_show("407rx02", 0x901); _rx = series_show("407rx02", 0x901);
break; break;
case 23: case 23:
terminateMachineAndNull(_rx); terminateMachineAndNull(_rx);
switch (_val4) { switch (_roxyState) {
case 1: case 1:
_roxyShould = 26; _roxyShould = 26;
break; break;
@ -421,7 +421,7 @@ void Room407::daemon() {
case 29: case 29:
_roxyShould = 22; _roxyShould = 22;
kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION); kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
kernel_trigger_dispatch_now(1); player_set_commands_allowed(true);
break; break;
case 30: case 30:
@ -461,7 +461,7 @@ void Room407::daemon() {
switch (_vipeShould) { switch (_vipeShould) {
case 35: case 35:
_vp02.show("407vp02", 0x300); _vp02.show("407vp02", 0x300);
_val4 = 1; _roxyState = 1;
_roxyShould = 23; _roxyShould = 23;
kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION); kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
break; break;
@ -550,7 +550,7 @@ void Room407::daemon() {
kernel_trigger_dispatch_now(kCHANGE_DRUMZ_ANIMATION); kernel_trigger_dispatch_now(kCHANGE_DRUMZ_ANIMATION);
} }
_val4 = 3; _roxyState = 3;
_roxyShould = 20; _roxyShould = 20;
kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION); kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
break; break;
@ -564,7 +564,7 @@ void Room407::daemon() {
kernel_trigger_dispatch_now(kCHANGE_DRUMZ_ANIMATION); kernel_trigger_dispatch_now(kCHANGE_DRUMZ_ANIMATION);
} }
_val4 = 2; _roxyState = 2;
_roxyShould = 23; _roxyShould = 23;
kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION); kernel_trigger_dispatch_now(kCHANGE_ROXY_ANIMATION);
break; break;

2
engines/m4/burger/rooms/section4/room407.h
View File

@ -62,7 +62,7 @@ private:
int _val1 = 0; int _val1 = 0;
int _drumzShould = 0; int _drumzShould = 0;
int _roxyShould = 0; int _roxyShould = 0;
int _val4 = 0; int _roxyState = 0;
int _vipeShould = 0; int _vipeShould = 0;
//int _digiTrigger = 0; //int _digiTrigger = 0;