[Scummvm-git-logs] scummvm master -> 265b6f2e976dd0a64fa62fed65659fd50dc16688
dreammaster
noreply at scummvm.org
Tue Feb 4 02:50:06 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
160e1f0aca M4: RIDDLE: Menendez talk fixes
265b6f2e97 M4: RIDDLE: Reduce panning todo warning to once per room
Commit: 160e1f0acaf968e5e5fb35d1b4175d4dab23e79e
https://github.com/scummvm/scummvm/commit/160e1f0acaf968e5e5fb35d1b4175d4dab23e79e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-03T18:49:43-08:00
Commit Message:
M4: RIDDLE: Menendez talk fixes
Changed paths:
engines/m4/riddle/rooms/section5/room504.cpp
engines/m4/riddle/rooms/section5/room504.h
diff --git a/engines/m4/riddle/rooms/section5/room504.cpp b/engines/m4/riddle/rooms/section5/room504.cpp
index f7733b2bae3..b74a65878cf 100644
--- a/engines/m4/riddle/rooms/section5/room504.cpp
+++ b/engines/m4/riddle/rooms/section5/room504.cpp
@@ -126,8 +126,8 @@ void Room504::daemon() {
break;
case 502:
- _val2 = 1;
- _convState1 = 1;
+ _menendezMode = 1;
+ _menendezShould = 1;
_trigger2 = -1;
_trigger3 = -1;
_mzDigs = series_load("504 MZ DIGS");
@@ -138,27 +138,27 @@ void Room504::daemon() {
break;
case 503:
- if (_trigger2 != -1 && _convState1 == 2 && _val2 == 2) {
+ if (_trigger2 != -1 && _menendezShould == 2 && _menendezMode == 2) {
kernel_trigger_dispatchx(_trigger2);
_trigger2 = -1;
}
- if (_trigger3 != -1 && _convState1 == 1 && _val2 == 1) {
+ if (_trigger3 != -1 && _menendezShould == 1 && _menendezMode == 1) {
kernel_trigger_dispatchx(_trigger3);
_trigger3 = -1;
}
- if (_trigger3 != -1 && _convState1 == 5 && _val2 == 5) {
+ if (_trigger3 != -1 && _menendezShould == 5 && _menendezMode == 5) {
kernel_trigger_dispatchx(_trigger3);
_trigger3 = -1;
}
- if (_trigger3 != -1 && _convState1 == 9 && _val2 == 9) {
+ if (_trigger3 != -1 && _menendezShould == 9 && _menendezMode == 9) {
kernel_trigger_dispatchx(_trigger3);
_trigger3 = -1;
}
- if (_trigger3 != -1 && _convState1 == 15 && _val2 == 15) {
+ if (_trigger3 != -1 && _menendezShould == 15 && _menendezMode == 15) {
kernel_trigger_dispatchx(_trigger3);
_trigger3 = -1;
}
@@ -167,9 +167,9 @@ void Room504::daemon() {
break;
case 504:
- switch (_val2) {
+ switch (_menendezMode) {
case 1:
- switch (_convState1) {
+ switch (_menendezShould) {
case 1:
sendWSMessage_10000(1, _mzMachine, _mzDigs, 1, 23, 503,
_mzDigs, 23, 23, 0);
@@ -208,7 +208,7 @@ void Room504::daemon() {
case 2:
sendWSMessage_10000(1, _mzMachine, _mzStandsTalks, 1, 11, 503,
_mzStandsTalks, 11, 11, 0);
- _val2 = 2;
+ _menendezMode = 2;
break;
default:
@@ -217,11 +217,11 @@ void Room504::daemon() {
break;
case 2:
- switch (_convState1) {
+ switch (_menendezShould) {
case 1:
sendWSMessage_10000(1, _mzMachine, _mzStandsTalks, 11, 1, 503,
_mzStandsTalks, 1, 1, 0);
- _val2 = 1;
+ _menendezMode = 1;
break;
case 2:
@@ -239,7 +239,7 @@ void Room504::daemon() {
_mzTakesMoney = series_load("504 MZ TAKES MONEY");
sendWSMessage_10000(1, _mzMachine, _mzTakesMoney, 1, 11, 503,
_mzTakesMoney, 11, 11, 0);
- _val2 = 5;
+ _menendezMode = 5;
break;
case 6:
@@ -252,7 +252,7 @@ void Room504::daemon() {
_mzGivesHead = series_load("504 MZ GIVES HEAD");
sendWSMessage_10000(1, _mzMachine, _mzGivesHead, 1, 27, 503,
_mzGivesHead, 28, 28, 0);
- _val2 = 9;
+ _menendezMode = 9;
break;
case 10:
@@ -260,22 +260,23 @@ void Room504::daemon() {
digi_play(conv_sound_to_play(), 1);
sendWSMessage_10000(1, _mzMachine, _mzGivesHead, 1, 27, 503,
_mzGivesHead, 28, 28, 0);
- _convState1 = 11;
+ _menendezShould = 11;
break;
case 11:
kernel_timing_trigger(60, 503);
- _convState1 = 12;
+ _menendezShould = 12;
break;
case 12:
sendWSMessage_10000(1, _mzMachine, _mzGivesHead, 27, 1, 503,
_mzGivesHead, 1, 1, 0);
+ _menendezShould = 13;
break;
case 13:
conv_resume();
- _convState1 = 2;
+ _menendezShould = 2;
kernel_timing_trigger(1, 503);
break;
@@ -287,15 +288,15 @@ void Room504::daemon() {
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 1, 21, 503,
_mzMenancesClimbs, 21, 21, 0);
sendWSMessage_190000(3);
- _convState1 = 15;
- _val2 = 15;
+ _menendezShould = 15;
+ _menendezMode = 15;
break;
case 16:
_mzMenancesClimbs = series_load("504 MZ MENACES CLIMBS");
_ripLeansBack = series_load("504 rip leans back");
- digi_preload("504_502D");
- digi_play("504_502D", 1);
+ digi_preload("504_S02D");
+ digi_play("504_S02D", 1);
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 1, 21, 524,
_mzMenancesClimbs, 21, 21, 0);
sendWSMessage_190000(_mzMachine, 3);
@@ -309,18 +310,18 @@ void Room504::daemon() {
break;
case 5:
- switch (_convState1) {
+ switch (_menendezShould) {
case 2:
sendWSMessage_10000(1, _mzMachine, _mzTakesMoney, 12, 32, 503,
_mzTakesMoney, 32, 32, 0);
- _convState1 = 3;
+ _menendezShould = 3;
break;
case 3:
sendWSMessage_10000(1, _mzMachine, _mzStandsTalks, 11, 11, 503,
_mzStandsTalks, 11, 11, 0);
- _convState1 = 2;
- _val2 = 2;
+ _menendezShould = 2;
+ _menendezMode = 2;
series_unload(_mzTakesMoney);
break;
@@ -335,24 +336,24 @@ void Room504::daemon() {
break;
case 9:
- switch (_convState1) {
+ switch (_menendezShould) {
case 2:
sendWSMessage_10000(1, _mzMachine, _mzGivesHead, 30, 43, 503,
_mzGivesHead, 43, 43, 0);
- _convState1 = 3;
+ _menendezShould = 3;
break;
case 3:
sendWSMessage_10000(1, _mzMachine, _mzStandsTalks, 11, 11, 503,
_mzStandsTalks, 11, 11, 0);
- _convState1 = 2;
- _val2 = 2;
+ _menendezShould = 2;
+ _menendezMode = 2;
series_unload(_mzGivesHead);
break;
case 9:
- sendWSMessage_10000(1, _mzMachine, _mzStandsTalks, 28, 28, 503,
- _mzStandsTalks, 28, 28, 0);
+ sendWSMessage_10000(1, _mzMachine, _mzGivesHead, 28, 28, 503,
+ _mzGivesHead, 28, 28, 0);
break;
default:
@@ -361,18 +362,18 @@ void Room504::daemon() {
break;
case 15:
- switch (_convState1) {
+ switch (_menendezShould) {
case 2:
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 21, 1, 503,
_mzMenancesClimbs, 1, 1, 0);
- _convState1 = 3;
+ _menendezShould = 3;
break;
case 3:
sendWSMessage_10000(1, _mzMachine, _mzStandsTalks, 11, 11, 503,
_mzStandsTalks, 11, 11, 0);
- _convState1 = 2;
- _val2 = 2;
+ _menendezShould = 2;
+ _menendezMode = 2;
series_unload(_mzMenancesClimbs);
digi_unload("504_S02D");
break;
@@ -401,36 +402,36 @@ void Room504::daemon() {
_ripKneels = series_load("504 rip kneels talks");
ws_hide_walker();
sendWSMessage_10000(1, _ripley, _ripKneels, 1, 17, 506, _ripKneels, 17, 17, 0);
- _convState2 = 1;
- _convState3 = 1;
+ _ripleyShould = 1;
+ _ripleyMode = 1;
break;
case 506:
- if (_trigger1 != -1 && _convState3 == 1 && _convState2 == 1) {
+ if (_trigger1 != -1 && _ripleyMode == 1 && _ripleyShould == 1) {
kernel_trigger_dispatchx(_trigger1);
_trigger1 = -1;
}
- if (_trigger4 != -1 && _convState3 == 4 && _convState2 == 4) {
+ if (_trigger4 != -1 && _ripleyMode == 4 && _ripleyShould == 4) {
kernel_trigger_dispatchx(_trigger4);
_trigger4 = -1;
}
- if (_trigger4 != -1 && _convState3 == 5 && _convState2 == 5) {
+ if (_trigger4 != -1 && _ripleyMode == 5 && _ripleyShould == 5) {
kernel_trigger_dispatchx(_trigger4);
_trigger4 = -1;
}
- if (_trigger4 != -1 && _convState3 == 7 && _convState2 == 7) {
+ if (_trigger4 != -1 && _ripleyMode == 7 && _ripleyShould == 7) {
kernel_trigger_dispatchx(_trigger4);
_trigger4 = -1;
}
- if (_trigger4 != -1 && _convState3 == 11 && _convState2 == 11) {
+ if (_trigger4 != -1 && _ripleyMode == 11 && _ripleyShould == 11) {
kernel_trigger_dispatchx(_trigger4);
_trigger4 = -1;
}
- if (_trigger4 != -1 && _convState3 == 13 && _convState2 == 13) {
+ if (_trigger4 != -1 && _ripleyMode == 13 && _ripleyShould == 13) {
kernel_trigger_dispatchx(_trigger4);
_trigger4 = -1;
}
- if (_trigger4 != -1 && _convState3 == 8 && _convState2 == 8) {
+ if (_trigger4 != -1 && _ripleyMode == 8 && _ripleyShould == 8) {
kernel_trigger_dispatchx(_trigger4);
_trigger4 = -1;
}
@@ -439,9 +440,9 @@ void Room504::daemon() {
break;
case 507:
- switch (_convState3) {
+ switch (_ripleyMode) {
case 1:
- switch (_convState2) {
+ switch (_ripleyShould) {
case 1:
sendWSMessage_10000(1, _ripley, _ripKneels, 17, 17, 506,
_ripKneels, 17, 17, 0);
@@ -457,14 +458,14 @@ void Room504::daemon() {
_ripShrunkenHead = series_load("504 rip gets shrunken head");
sendWSMessage_10000(1, _ripley, _ripShrunkenHead, 1, 6, 506,
_ripShrunkenHead, 6, 6, 0);
- _convState3 = 4;
+ _ripleyMode = 4;
break;
case 5:
_ripGivesMoneyEmerald = series_load("504 rip gives money emerald");
sendWSMessage_10000(1, _ripley, _ripGivesMoneyEmerald, 1, 11, 506,
_ripGivesMoneyEmerald, 11, 11, 0);
- _convState3 = 5;
+ _ripleyMode = 5;
break;
case 7:
@@ -474,13 +475,13 @@ void Room504::daemon() {
_ripGetsUp, 46, 46, 0);
sendWSMessage_190000(_ripley, 5);
series_unload(_ripKneels);
- _convState3 = 7;
+ _ripleyMode = 7;
break;
case 8:
sendWSMessage_10000(1, _ripley, _ripLeansBack, 1, 11, 506,
_ripLeansBack, 12, 12, 0);
- _convState3 = 8;
+ _ripleyMode = 8;
break;
default:
@@ -489,19 +490,19 @@ void Room504::daemon() {
break;
case 4:
- switch (_convState2) {
+ switch (_ripleyShould) {
case 1:
sendWSMessage_10000(1, _ripley, _ripShrunkenHead, 7, 28, 506,
_ripShrunkenHead, 28, 28, 0);
- _convState2 = 2;
+ _ripleyShould = 2;
break;
case 2:
sendWSMessage_10000(1, _ripley, _ripKneels, 17, 17, 506,
_ripKneels, 17, 17, 0);
series_unload(_ripShrunkenHead);
- _convState2 = 1;
- _convState3 = 1;
+ _ripleyShould = 1;
+ _ripleyMode = 1;
break;
case 4:
@@ -515,18 +516,18 @@ void Room504::daemon() {
break;
case 5:
- switch (_convState2) {
+ switch (_ripleyShould) {
case 1:
sendWSMessage_10000(1, _ripley, _ripGivesMoneyEmerald, 12, 20, 506,
_ripKneels, 17, 17, 0);
- _convState2 = 2;
+ _ripleyShould = 2;
break;
case 2:
sendWSMessage_10000(1, _ripley, _ripKneels, 17, 17, 506, _ripKneels, 17, 17, 0);
series_unload(_ripGivesMoneyEmerald);
- _convState2 = 1;
- _convState3 = 1;
+ _ripleyShould = 1;
+ _ripleyMode = 1;
break;
case 5:
@@ -546,7 +547,7 @@ void Room504::daemon() {
break;
case 7:
- switch (_convState2) {
+ switch (_ripleyShould) {
case 7:
sendWSMessage_10000(1, _ripley, _ripGetsUp, 46, 46, 506, _ripGetsUp, 46, 46, 0);
break;
@@ -561,7 +562,7 @@ void Room504::daemon() {
case 11:
sendWSMessage_10000(1, _ripley, _ripGetsUp, 69, 83, 506,
_ripGetsUp, 83, 83, 0);
- _convState3 = 11;
+ _ripleyMode = 11;
break;
default:
@@ -570,18 +571,18 @@ void Room504::daemon() {
break;
case 8:
- switch (_convState2) {
+ switch (_ripleyShould) {
case 1:
sendWSMessage_10000(1, _ripley, _ripLeansBack, 12, 24, 506,
_ripKneels, 17, 17, 0);
- _convState2 = 2;
+ _ripleyShould = 2;
break;
case 2:
sendWSMessage_10000(1, _ripley, _ripKneels, 13, 25, 506,
_ripKneels, 17, 17, 0);
- _convState2 = 1;
- _convState3 = 1;
+ _ripleyShould = 1;
+ _ripleyMode = 1;
series_unload(_ripLeansBack);
break;
@@ -596,11 +597,11 @@ void Room504::daemon() {
break;
case 11:
- switch (_convState2) {
+ switch (_ripleyShould) {
case 7:
sendWSMessage_10000(1, _ripley, _ripGetsUp, 83, 69, 506, _ripGetsUp, 46, 46, 0);
- _convState2 = 7;
- _convState3 = 7;
+ _ripleyShould = 7;
+ _ripleyMode = 7;
break;
case 11:
@@ -610,7 +611,7 @@ void Room504::daemon() {
case 13:
_ripYells = series_load("504 rip yells ");
sendWSMessage_10000(1, _ripley, _ripYells, 1, 9, 506, _ripYells, 9, 9, 0);
- _convState3 = 13;
+ _ripleyMode = 13;
break;
default:
@@ -619,7 +620,7 @@ void Room504::daemon() {
break;
case 13:
- switch (_convState2) {
+ switch (_ripleyShould) {
case 10:
frame = imath_ranged_rand(10, 12);
sendWSMessage_10000(1, _ripley, _ripYells, frame, frame, 506,
@@ -628,17 +629,18 @@ void Room504::daemon() {
case 11:
sendWSMessage_10000(1, _ripley, _ripYells, 9, 1, 506,
_ripGetsUp, 83, 83, 0);
- _convState2 = 12;
+ _ripleyShould = 12;
break;
case 12:
- sendWSMessage_10000(1, _ripley, _ripYells, 9, 9, 506,
- _ripYells, 9, 9, 0);
- break;
- case 13:
sendWSMessage_10000(1, _ripley, _ripGetsUp, 83, 83, 506,
_ripGetsUp, 83, 83, 0);
- _convState2 = 11;
- _convState3 = 11;
+ _ripleyShould = 11;
+ _ripleyMode = 11;
+ series_unload(_ripYells);
+ break;
+ case 13:
+ sendWSMessage_10000(1, _ripley, _ripYells, 9, 9, 506,
+ _ripYells, 9, 9, 0);
break;
default:
break;
@@ -652,20 +654,20 @@ void Room504::daemon() {
case 508:
_G(kernel).trigger_mode = KT_PARSE;
- conv_load("con504a", 10, 10, 747);
- _val3 = inv_player_has("PERUVIAN INTI") ? 1 : 0;
- conv_export_pointer_curr(&_val3, 0);
+ conv_load("conv504a", 10, 10, 747);
+ _hasInti = inv_player_has("PERUVIAN INTI") ? 1 : 0;
+ conv_export_pointer_curr(&_hasInti, 0);
conv_play();
break;
case 509:
- _convState1 = 2;
+ _menendezShould = 2;
_trigger2 = kernel_trigger_create(510);
break;
case 510:
- _convState1 = 1;
- _convState2 = 9;
+ _menendezShould = 1;
+ _ripleyShould = 9;
if (!_G(flags)[V040]) {
_G(flags)[V040] = 1;
@@ -681,34 +683,34 @@ void Room504::daemon() {
break;
case 512:
- _convState2 = 3;
+ _ripleyShould = 3;
digi_play("504R51", 1, 255, 513);
break;
case 513:
- _convState2 = 1;
- _convState1 = 2;
+ _ripleyShould = 1;
+ _menendezShould = 2;
_trigger2 = kernel_trigger_create(514);
break;
case 514:
- _convState2 = 5;
+ _ripleyShould = 5;
_trigger4 = kernel_trigger_create(515);
break;
case 515:
- _convState2 = 6;
+ _ripleyShould = 6;
digi_play("504R13", 1, 255, 516);
break;
case 516:
- _convState2 = 5;
- _convState1 = 6;
+ _ripleyShould = 5;
+ _menendezShould = 6;
break;
case 517:
inv_move_object("ROMANOV EMERALD", 504);
- _convState2 = 1;
+ _ripleyShould = 1;
sendWSMessage_10000(1, _mzMachine, _mzTakesEmerald, 13, 20, 518,
_mzTakesEmerald, 20, 20, 0);
break;
@@ -720,34 +722,34 @@ void Room504::daemon() {
break;
case 519:
- _convState2 = 3;
+ _ripleyShould = 3;
digi_play("504R14", 1, 255, 520);
break;
case 520:
- _convState2 = 1;
+ _ripleyShould = 1;
sendWSMessage_10000(1, _mzMachine, _mzTakesEmerald, 21, 29, 503,
_mzStandsTalks, 11, 11, 4);
- _convState1 = 2;
- _val2 = 2;
+ _menendezShould = 2;
+ _menendezMode = 2;
_trigger2 = kernel_trigger_create(521);
break;
case 521:
series_unload(_mzTakesEmerald);
- _convState1 = 4;
+ _menendezShould = 4;
digi_play("504Z15", 1, 255, 522);
break;
case 522:
- _convState1 = 2;
- _convState2 = 5;
+ _menendezShould = 2;
+ _ripleyShould = 5;
digi_play("504R15", 1, 255, 523);
break;
case 523:
- _convState2 = 1;
- _convState1 = 16;
+ _ripleyShould = 1;
+ _menendezShould = 16;
break;
case 524:
@@ -755,7 +757,7 @@ void Room504::daemon() {
break;
case 525:
- _convState2 = 8;
+ _ripleyShould = 8;
_trigger4 = kernel_trigger_create(526);
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 21, 23, -1,
_mzMenancesClimbs, 21, 23, 4);
@@ -763,9 +765,9 @@ void Room504::daemon() {
break;
case 526:
- _convState2 = 1;
+ _ripleyShould = 1;
digi_preload("504_S06");
- sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 22, 52, 527, \
+ sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 22, 52, 527,
_mzMenancesClimbs, 52, 52, 0);
break;
@@ -775,33 +777,33 @@ void Room504::daemon() {
case 528:
digi_unload("504_S06");
- _convState2 = 1;
+ _ripleyShould = 1;
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 52, 59, -1,
_mzMenancesClimbs, 58, 59, 4);
digi_play("504Z16", 1, 255, 529);
break;
case 529:
- _convState2 = 3;
+ _ripleyShould = 3;
digi_play("504R16", 1, 255, 530);
break;
case 530:
- _convState2 = 1;
+ _ripleyShould = 1;
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 60, 61, -1,
_mzMenancesClimbs, 60, 62, 4);
digi_play("504Z17", 1, 255, 531);
break;
case 531:
- _convState2 = 7;
+ _ripleyShould = 7;
digi_preload("504_S07");
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 62, 76, 532,
_mzMenancesClimbs, 77, 77, 0);
break;
case 532:
- _convState2 = 11;
+ _ripleyShould = 11;
digi_preload("504_S07");
sendWSMessage_10000(1, _mzMachine, _mzMenancesClimbs, 78, 140, 533,
_mzMenancesClimbs, 140, 140, 0);
@@ -829,27 +831,27 @@ void Room504::daemon() {
case 535:
case 539:
- _convState2 = 13;
+ _ripleyShould = 13;
break;
case 536:
- _convState2 = 10;
+ _ripleyShould = 10;
digi_play("504R17", 1, 255, 537);
break;
case 537:
- _convState2 = 13;
+ _ripleyShould = 13;
digi_play("504Z18", 1, 255, 538);
break;
case 538:
- _convState2 = 10;
+ _ripleyShould = 10;
digi_play("504R18", 1, 255, 540);
kernel_timing_trigger(150, 539);
break;
case 540:
- _convState2 = 10;
+ _ripleyShould = 10;
digi_play("504R18A", 1, 255, 541);
break;
@@ -858,7 +860,7 @@ void Room504::daemon() {
break;
case 542:
- _convState2 = 11;
+ _ripleyShould = 11;
_trigger4 = kernel_trigger_create(543);
break;
@@ -867,7 +869,7 @@ void Room504::daemon() {
break;
case 544:
- _convState2 = 7;
+ _ripleyShould = 7;
_trigger4 = kernel_trigger_create(545);
break;
@@ -876,7 +878,7 @@ void Room504::daemon() {
kernel_timing_trigger(5, 745);
_G(flags)[V141] = 1;
setMiscItems();
- _convState2 = 9;
+ _ripleyShould = 9;
break;
case 548:
@@ -886,33 +888,33 @@ void Room504::daemon() {
break;
case 549:
- _convState2 = 3;
+ _ripleyShould = 3;
digi_play("504R51", 1, 255, 550);
break;
case 550:
- _convState2 = 1;
- _convState1 = 2;
+ _ripleyShould = 1;
+ _menendezShould = 2;
_trigger2 = kernel_trigger_create(551);
break;
case 551:
- _convState2 = 5;
+ _ripleyShould = 5;
_trigger4 = kernel_trigger_create(552);
break;
case 552:
- _convState2 = 6;
+ _ripleyShould = 6;
digi_play("504R13", 1, 255, 553);
break;
case 553:
- _convState2 = 5;
- _convState1 = 4;
+ _ripleyShould = 5;
+ _menendezShould = 4;
if (_flag4) {
_flag4 = false;
- _convState1 = 5;
+ _menendezShould = 5;
_trigger3 = kernel_trigger_create(554);
} else {
switch (imath_ranged_rand(1, 3)) {
@@ -934,22 +936,22 @@ void Room504::daemon() {
break;
case 554:
- _convState1 = 2;
+ _menendezShould = 2;
_trigger2 = kernel_trigger_create(555);
break;
case 555:
- _convState2 = 1;
+ _ripleyShould = 1;
digi_play("504Z12", 1, 255, 556);
break;
case 556:
- _convState1 = 1;
+ _menendezShould = 1;
_trigger1 = kernel_trigger_create(557);
break;
case 557:
- _convState2 = 9;
+ _ripleyShould = 9;
break;
case 558:
@@ -1665,29 +1667,29 @@ void Room504::daemon() {
break;
case 657:
- _convState2 = 5;
+ _ripleyShould = 5;
_trigger4 = kernel_trigger_create(658);
break;
case 658:
- _convState2 = 6;
- digi_play(conv_sound_to_play(), 1, 255, 549);
+ _ripleyShould = 6;
+ digi_play(conv_sound_to_play(), 1, 255, 659);
break;
case 659:
- _convState2 = 5;
- _convState1 = 5;
- _trigger3 = kernel_trigger_create(659);
+ _ripleyShould = 5;
+ _menendezShould = 5;
+ _trigger3 = kernel_trigger_create(660);
break;
case 660:
- _convState2 = 1;
- _convState1 = 2;
+ _ripleyShould = 1;
+ _menendezShould = 2;
_trigger2 = kernel_trigger_create(661);
break;
case 661:
- _convState1 = 9;
+ _menendezShould = 9;
_trigger3 = kernel_trigger_create(662);
break;
@@ -1697,7 +1699,7 @@ void Room504::daemon() {
case 663:
inv_give_to_player("SHRUNKEN HEAD");
- _convState2 = 4;
+ _ripleyShould = 4;
_trigger4 = kernel_trigger_create(664);
break;
@@ -1707,8 +1709,8 @@ void Room504::daemon() {
break;
case 665:
- _convState1 = 2;
- _convState2 = 1;
+ _menendezShould = 2;
+ _ripleyShould = 1;
_trigger2 = kernel_trigger_create(666);
break;
@@ -1722,12 +1724,12 @@ void Room504::daemon() {
break;
case 669:
- _convState1 = 15;
+ _menendezShould = 15;
_trigger3 = kernel_trigger_create(670);
break;
case 670:
- _convState2 = 8;
+ _ripleyShould = 8;
_trigger4 = kernel_trigger_create(671);
break;
@@ -1736,8 +1738,8 @@ void Room504::daemon() {
break;
case 672:
- _convState1 = 2;
- _convState2 = 1;
+ _menendezShould = 2;
+ _ripleyShould = 1;
_trigger1 = kernel_trigger_create(673);
break;
@@ -2392,12 +2394,12 @@ void Room504::parser() {
}
break;
case 2:
- _convState2 = 3;
+ _ripleyShould = 3;
digi_play("504R51", 1, 255, 3);
break;
case 3:
- _convState2 = 1;
- _convState1 = 2;
+ _ripleyShould = 1;
+ _menendezShould = 2;
_trigger2 = kernel_trigger_create(4);
break;
case 4:
@@ -3589,20 +3591,20 @@ void Room504::conv504a() {
if (_G(kernel).trigger == 1) {
if (who <= 0)
- _convState1 = 2;
+ _menendezShould = 2;
else if (who == 1)
- _convState2 = 1;
+ _ripleyShould = 1;
conv_resume();
} else {
if (who <= 0) {
if (node == 8 && entry == 3) {
- _convState1 = 10;
+ _menendezShould = 10;
} else if (node == 19 && entry == 2) {
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, 669);
} else {
- _convState1 = 4;
+ _menendezShould = 4;
if (sound)
digi_play(sound, 1, 255, 1);
@@ -3614,7 +3616,7 @@ void Room504::conv504a() {
_G(kernel).trigger_mode = KT_DAEMON;
kernel_timing_trigger(1, 657);
} else {
- _convState2 = 3;
+ _ripleyShould = 3;
if (sound)
digi_play(sound, 1, 255, 1);
diff --git a/engines/m4/riddle/rooms/section5/room504.h b/engines/m4/riddle/rooms/section5/room504.h
index 33f37abcd76..2ae5d9b02b9 100644
--- a/engines/m4/riddle/rooms/section5/room504.h
+++ b/engines/m4/riddle/rooms/section5/room504.h
@@ -36,9 +36,9 @@ private:
int _downSteps = 0;
int _volume = 0;
int _volume2 = 0;
- int _convState1 = 0;
- int _convState2 = 0;
- int _convState3 = 0;
+ int _menendezShould = 0;
+ int _ripleyShould = 0;
+ int _ripleyMode = 0;
int _ripSketching = 0;
int _ripLowReach = 0;
int _ripMedReach = 0;
@@ -93,8 +93,8 @@ private:
int _trigger3 = 0;
int _trigger4 = 0;
int _vineThrowType = 0;
- int _val2 = 0;
- int32 _val3 = 0;
+ int _menendezMode = 0;
+ int32 _hasInti = 0;
void setVines();
void freeVines();
Commit: 265b6f2e976dd0a64fa62fed65659fd50dc16688
https://github.com/scummvm/scummvm/commit/265b6f2e976dd0a64fa62fed65659fd50dc16688
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-03T18:49:44-08:00
Commit Message:
M4: RIDDLE: Reduce panning todo warning to once per room
Changed paths:
engines/m4/platform/sound/digi.cpp
engines/m4/platform/sound/digi.h
diff --git a/engines/m4/platform/sound/digi.cpp b/engines/m4/platform/sound/digi.cpp
index 05b446c08e0..38be5b66f31 100644
--- a/engines/m4/platform/sound/digi.cpp
+++ b/engines/m4/platform/sound/digi.cpp
@@ -224,7 +224,10 @@ int32 Digi::ticks_to_play(const char *name, int roomNum) {
}
void Digi::change_panning(int val1, int val2) {
- warning("TODO: digi_change_panning");
+ if (_G(game).room_id != _panningTodoRoom) {
+ _panningTodoRoom = _G(game).room_id;
+ warning("TODO: digi_change_panning");
+ }
}
} // namespace Sound
diff --git a/engines/m4/platform/sound/digi.h b/engines/m4/platform/sound/digi.h
index 79366308f10..e046bc176b4 100644
--- a/engines/m4/platform/sound/digi.h
+++ b/engines/m4/platform/sound/digi.h
@@ -61,6 +61,7 @@ private:
Audio::Mixer *_mixer;
Channel _channels[4];
Common::HashMap<Common::String, DigiEntry> _sounds;
+ int _panningTodoRoom = 0;
int32 play(const Common::String &name, uint channel, int32 vol, int32 trigger,
int32 room_num, bool loop);
More information about the Scummvm-git-logs
mailing list