[Scummvm-git-logs] scummvm master -> c697c93af666e7bb3c826bb935d68eeddc9680f0
dreammaster
noreply at scummvm.org
Fri Nov 22 03:42:40 UTC 2024
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c2ed579734 M4: RIDDLE: Twelvetrees conv fixes
e44de89326 M4: RIDDLE: Twelvetrees conv fixes
c697c93af6 M4: RIDDLE: Fix crashes loading Easter Island background noises
Commit: c2ed579734cee9ef3f6ef2439d2aea5663723c9b
https://github.com/scummvm/scummvm/commit/c2ed579734cee9ef3f6ef2439d2aea5663723c9b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-21T19:40:57-08:00
Commit Message:
M4: RIDDLE: Twelvetrees conv fixes
Changed paths:
engines/m4/riddle/rooms/section6/room603.cpp
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index 3abf7e6d8dc..1dbb25aca52 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -723,7 +723,7 @@ void Room603::daemon() {
case 303:
if (_ttShould == 22)
- kernel_timing_trigger(1, 22);
+ kernel_timing_trigger(1, 202);
else
_ttShould = 5;
break;
Commit: e44de8932607c26201aca868ad9492a85a7a8547
https://github.com/scummvm/scummvm/commit/e44de8932607c26201aca868ad9492a85a7a8547
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-21T19:40:57-08:00
Commit Message:
M4: RIDDLE: Twelvetrees conv fixes
Changed paths:
engines/m4/riddle/rooms/section6/room603.cpp
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index 1dbb25aca52..7b99e38d2e5 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -549,6 +549,7 @@ void Room603::daemon() {
break;
case 2:
case 8:
+ case 13:
case 14:
sendWSMessage_10000(1, _ripley, _ripHandsBehindBack, 1, 15, 300,
_ripHandsBehindBack, 15, 15, 0);
@@ -1268,6 +1269,10 @@ void Room603::parser() {
} else if (_G(kernel).trigger == 747) {
if (_ttShould != 20) {
unloadSeries();
+ _G(player).disable_hyperwalk = false;
+ _G(flags)[V204] = 0;
+ _G(flags)[V205] = 0;
+
_val9 = 1000;
_ripleyShould = 11;
_ttShould = 17;
Commit: c697c93af666e7bb3c826bb935d68eeddc9680f0
https://github.com/scummvm/scummvm/commit/c697c93af666e7bb3c826bb935d68eeddc9680f0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-21T19:40:57-08:00
Commit Message:
M4: RIDDLE: Fix crashes loading Easter Island background noises
Changed paths:
engines/m4/riddle/rooms/section6/room626.cpp
engines/m4/riddle/rooms/section6/room627.cpp
engines/m4/riddle/rooms/section6/room628.cpp
engines/m4/riddle/rooms/section6/room629.cpp
engines/m4/riddle/rooms/section6/room630.cpp
engines/m4/riddle/rooms/section6/room631.cpp
engines/m4/riddle/rooms/section6/room632.cpp
engines/m4/riddle/rooms/section6/room633.cpp
engines/m4/riddle/rooms/section6/room634.cpp
engines/m4/riddle/rooms/section6/room635.cpp
engines/m4/riddle/rooms/section6/room636.cpp
engines/m4/riddle/rooms/section6/room637.cpp
engines/m4/riddle/rooms/section6/room638.cpp
engines/m4/riddle/rooms/section6/room640.cpp
engines/m4/riddle/rooms/section6/room641.cpp
engines/m4/riddle/rooms/section6/room642.cpp
engines/m4/riddle/rooms/section6/room643.cpp
engines/m4/riddle/rooms/section6/room644.cpp
engines/m4/riddle/rooms/section6/room645.cpp
engines/m4/riddle/rooms/section6/room646.cpp
engines/m4/riddle/rooms/section6/room647.cpp
engines/m4/riddle/rooms/section6/room648.cpp
engines/m4/riddle/rooms/section6/room649.cpp
engines/m4/riddle/rooms/section6/room650.cpp
engines/m4/riddle/rooms/section6/room651.cpp
diff --git a/engines/m4/riddle/rooms/section6/room626.cpp b/engines/m4/riddle/rooms/section6/room626.cpp
index 4b3c991d5f4..f035e3523e5 100644
--- a/engines/m4/riddle/rooms/section6/room626.cpp
+++ b/engines/m4/riddle/rooms/section6/room626.cpp
@@ -54,7 +54,7 @@ void Room626::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room626::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room627.cpp b/engines/m4/riddle/rooms/section6/room627.cpp
index 75a585454d7..2f1d84df7fe 100644
--- a/engines/m4/riddle/rooms/section6/room627.cpp
+++ b/engines/m4/riddle/rooms/section6/room627.cpp
@@ -59,7 +59,7 @@ void Room627::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room627::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room628.cpp b/engines/m4/riddle/rooms/section6/room628.cpp
index 13cfc446664..a9b180f81b9 100644
--- a/engines/m4/riddle/rooms/section6/room628.cpp
+++ b/engines/m4/riddle/rooms/section6/room628.cpp
@@ -59,7 +59,7 @@ void Room628::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room628::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room629.cpp b/engines/m4/riddle/rooms/section6/room629.cpp
index 6b8bba61d5d..2e2bf6bd5f4 100644
--- a/engines/m4/riddle/rooms/section6/room629.cpp
+++ b/engines/m4/riddle/rooms/section6/room629.cpp
@@ -59,7 +59,7 @@ void Room629::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room629::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room630.cpp b/engines/m4/riddle/rooms/section6/room630.cpp
index 5fb4ea3d765..061a1b1ba29 100644
--- a/engines/m4/riddle/rooms/section6/room630.cpp
+++ b/engines/m4/riddle/rooms/section6/room630.cpp
@@ -53,7 +53,7 @@ void Room630::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room630::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room631.cpp b/engines/m4/riddle/rooms/section6/room631.cpp
index 054af5baeab..324abddf1a8 100644
--- a/engines/m4/riddle/rooms/section6/room631.cpp
+++ b/engines/m4/riddle/rooms/section6/room631.cpp
@@ -53,7 +53,7 @@ void Room631::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room631::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room632.cpp b/engines/m4/riddle/rooms/section6/room632.cpp
index 5eca730a19f..4e5f8209570 100644
--- a/engines/m4/riddle/rooms/section6/room632.cpp
+++ b/engines/m4/riddle/rooms/section6/room632.cpp
@@ -59,7 +59,7 @@ void Room632::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room632::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room633.cpp b/engines/m4/riddle/rooms/section6/room633.cpp
index ee28c2537fd..c9112fe1827 100644
--- a/engines/m4/riddle/rooms/section6/room633.cpp
+++ b/engines/m4/riddle/rooms/section6/room633.cpp
@@ -59,7 +59,7 @@ void Room633::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room633::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room634.cpp b/engines/m4/riddle/rooms/section6/room634.cpp
index 9b589f37a33..d0302ae26ae 100644
--- a/engines/m4/riddle/rooms/section6/room634.cpp
+++ b/engines/m4/riddle/rooms/section6/room634.cpp
@@ -59,7 +59,7 @@ void Room634::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room634::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room635.cpp b/engines/m4/riddle/rooms/section6/room635.cpp
index 18718f07d60..aae59a61390 100644
--- a/engines/m4/riddle/rooms/section6/room635.cpp
+++ b/engines/m4/riddle/rooms/section6/room635.cpp
@@ -59,7 +59,7 @@ void Room635::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room635::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room636.cpp b/engines/m4/riddle/rooms/section6/room636.cpp
index 3cb748bc9cf..5f15e03ffdd 100644
--- a/engines/m4/riddle/rooms/section6/room636.cpp
+++ b/engines/m4/riddle/rooms/section6/room636.cpp
@@ -49,7 +49,7 @@ void Room636::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room636::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room637.cpp b/engines/m4/riddle/rooms/section6/room637.cpp
index 0ed869e1ba4..ae1217fdc38 100644
--- a/engines/m4/riddle/rooms/section6/room637.cpp
+++ b/engines/m4/riddle/rooms/section6/room637.cpp
@@ -53,7 +53,7 @@ void Room637::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room637::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room638.cpp b/engines/m4/riddle/rooms/section6/room638.cpp
index 6b2daa579c1..017654f027f 100644
--- a/engines/m4/riddle/rooms/section6/room638.cpp
+++ b/engines/m4/riddle/rooms/section6/room638.cpp
@@ -59,7 +59,7 @@ void Room638::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room638::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room640.cpp b/engines/m4/riddle/rooms/section6/room640.cpp
index 338a15cd43c..d2f847b5e1a 100644
--- a/engines/m4/riddle/rooms/section6/room640.cpp
+++ b/engines/m4/riddle/rooms/section6/room640.cpp
@@ -59,7 +59,7 @@ void Room640::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room640::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room641.cpp b/engines/m4/riddle/rooms/section6/room641.cpp
index 516dcba299d..130024dac30 100644
--- a/engines/m4/riddle/rooms/section6/room641.cpp
+++ b/engines/m4/riddle/rooms/section6/room641.cpp
@@ -59,7 +59,7 @@ void Room641::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room641::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room642.cpp b/engines/m4/riddle/rooms/section6/room642.cpp
index 24263aa2f27..68d04d3658f 100644
--- a/engines/m4/riddle/rooms/section6/room642.cpp
+++ b/engines/m4/riddle/rooms/section6/room642.cpp
@@ -53,7 +53,7 @@ void Room642::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room642::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room643.cpp b/engines/m4/riddle/rooms/section6/room643.cpp
index 3cd8fb26cc5..8c6095f9d9a 100644
--- a/engines/m4/riddle/rooms/section6/room643.cpp
+++ b/engines/m4/riddle/rooms/section6/room643.cpp
@@ -53,7 +53,7 @@ void Room643::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room643::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room644.cpp b/engines/m4/riddle/rooms/section6/room644.cpp
index 9946fda2e22..210fac73004 100644
--- a/engines/m4/riddle/rooms/section6/room644.cpp
+++ b/engines/m4/riddle/rooms/section6/room644.cpp
@@ -56,7 +56,7 @@ void Room644::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room644::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room645.cpp b/engines/m4/riddle/rooms/section6/room645.cpp
index 684c08505e4..0696fd70c91 100644
--- a/engines/m4/riddle/rooms/section6/room645.cpp
+++ b/engines/m4/riddle/rooms/section6/room645.cpp
@@ -55,7 +55,7 @@ void Room645::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room645::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room646.cpp b/engines/m4/riddle/rooms/section6/room646.cpp
index a264673cff9..27feeb9f185 100644
--- a/engines/m4/riddle/rooms/section6/room646.cpp
+++ b/engines/m4/riddle/rooms/section6/room646.cpp
@@ -59,7 +59,7 @@ void Room646::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room646::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room647.cpp b/engines/m4/riddle/rooms/section6/room647.cpp
index a3db90b1c1d..30775bf582f 100644
--- a/engines/m4/riddle/rooms/section6/room647.cpp
+++ b/engines/m4/riddle/rooms/section6/room647.cpp
@@ -59,7 +59,7 @@ void Room647::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room647::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room648.cpp b/engines/m4/riddle/rooms/section6/room648.cpp
index 05d4ffd3846..465961ad1c3 100644
--- a/engines/m4/riddle/rooms/section6/room648.cpp
+++ b/engines/m4/riddle/rooms/section6/room648.cpp
@@ -49,7 +49,7 @@ void Room648::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room648::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room649.cpp b/engines/m4/riddle/rooms/section6/room649.cpp
index 29214ede6f1..ce08cbf0c4d 100644
--- a/engines/m4/riddle/rooms/section6/room649.cpp
+++ b/engines/m4/riddle/rooms/section6/room649.cpp
@@ -43,7 +43,7 @@ void Room649::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room649::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room650.cpp b/engines/m4/riddle/rooms/section6/room650.cpp
index 395f8d9db3d..828e823d6e6 100644
--- a/engines/m4/riddle/rooms/section6/room650.cpp
+++ b/engines/m4/riddle/rooms/section6/room650.cpp
@@ -49,7 +49,7 @@ void Room650::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room650::parser() {
diff --git a/engines/m4/riddle/rooms/section6/room651.cpp b/engines/m4/riddle/rooms/section6/room651.cpp
index f8a99504571..a6e91f58422 100644
--- a/engines/m4/riddle/rooms/section6/room651.cpp
+++ b/engines/m4/riddle/rooms/section6/room651.cpp
@@ -53,7 +53,7 @@ void Room651::init() {
break;
}
- digi_play_loop("950_28c", 3);
+ digi_play_loop("950_s28c", 3);
}
void Room651::parser() {
More information about the Scummvm-git-logs
mailing list