[Scummvm-git-logs] scummvm master -> ae69ae23f91a89751228cda3f35a54db73c6fff3
dreammaster
noreply at scummvm.org
Sun Oct 13 17:44:20 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:
ae69ae23f9 M4: RIDDLE: Remove series_stream_check_series
Commit: ae69ae23f91a89751228cda3f35a54db73c6fff3
https://github.com/scummvm/scummvm/commit/ae69ae23f91a89751228cda3f35a54db73c6fff3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-13T10:42:57-07:00
Commit Message:
M4: RIDDLE: Remove series_stream_check_series
Replaced calls with existing series_set_frame_rate method.
The two versions were slightly different, with Orion Burger
giving an error if a null machine is passed, whereas Riddle
allows it.
Changed paths:
engines/m4/graphics/gr_series.cpp
engines/m4/graphics/gr_series.h
engines/m4/riddle/rooms/section3/room303.cpp
engines/m4/riddle/rooms/section3/room352.cpp
engines/m4/riddle/rooms/section4/room405.cpp
engines/m4/riddle/rooms/section4/room410.cpp
engines/m4/riddle/rooms/section4/room493.cpp
engines/m4/riddle/rooms/section5/room504.cpp
engines/m4/riddle/rooms/section5/room508.cpp
engines/m4/riddle/rooms/section6/room608.cpp
engines/m4/riddle/rooms/section6/room615.cpp
engines/m4/riddle/rooms/section9/room908.cpp
engines/m4/riddle/rooms/section9/room918.cpp
diff --git a/engines/m4/graphics/gr_series.cpp b/engines/m4/graphics/gr_series.cpp
index 746206cf108..7ac98e7e1ab 100644
--- a/engines/m4/graphics/gr_series.cpp
+++ b/engines/m4/graphics/gr_series.cpp
@@ -25,6 +25,7 @@
#include "m4/wscript/ws_machine.h"
#include "m4/wscript/wst_regs.h"
#include "m4/vars.h"
+#include "m4/m4.h"
namespace M4 {
@@ -201,8 +202,11 @@ bool series_stream_break_on_frame(machine *m, int32 frameNum, int32 trigger) {
void series_set_frame_rate(machine *m, int32 newFrameRate) {
CHECK_SERIES
- if ((!m) || (!m->myAnim8) || !verifyMachineExists(m))
- error_show(FL, 'SSFR');
+ if ((!m) || (!m->myAnim8) || !verifyMachineExists(m)) {
+ if (g_engine->getGameType() == GType_Burger)
+ error_show(FL, 'SSFR');
+ return;
+ }
m->myAnim8->myRegs[IDX_CELS_FRAME_RATE] = newFrameRate << 16;
}
@@ -349,9 +353,4 @@ machine *series_simple_play(const char *seriesName, frac16 layer, bool stickWhen
return series_play(seriesName, layer, flags);
}
-void series_stream_check_series(machine *m, int val) {
- // TODO: series_stream_check_series
- error("TODO: series_stream_check_series");
-}
-
} // namespace M4
diff --git a/engines/m4/graphics/gr_series.h b/engines/m4/graphics/gr_series.h
index 7dd9faa786f..994a47609d6 100644
--- a/engines/m4/graphics/gr_series.h
+++ b/engines/m4/graphics/gr_series.h
@@ -120,7 +120,6 @@ machine *series_play_xy(const char *seriesName, int loopCount, int flags,
machine *series_stream(const char *seriesName, int32 frameRate, int32 layer, int32 trigger);
bool series_stream_break_on_frame(machine *m, int32 frameNum, int32 trigger);
void series_set_frame_rate(machine *m, int32 newFrameRate);
-void series_stream_check_series(machine *m, int val);
} // namespace M4
diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 794a4654ef8..e977f026ad2 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -1901,12 +1901,12 @@ void Room303::conv303b() {
break;
case 2:
- series_stream_check_series(_ripPonders, 20);
+ series_set_frame_rate(_ripPonders, 20);
series_stream_break_on_frame(_ripPonders, 27, 3);
return;
case 3:
- series_stream_check_series(_ripPonders, 5);
+ series_set_frame_rate(_ripPonders, 5);
return;
case 4:
diff --git a/engines/m4/riddle/rooms/section3/room352.cpp b/engines/m4/riddle/rooms/section3/room352.cpp
index 4d035f81505..6191803d9f6 100644
--- a/engines/m4/riddle/rooms/section3/room352.cpp
+++ b/engines/m4/riddle/rooms/section3/room352.cpp
@@ -100,7 +100,7 @@ void Room352::daemon() {
break;
case 17:
- series_stream_check_series(_meiChecksShoe, 3000);
+ series_set_frame_rate(_meiChecksShoe, 3000);
break;
case 20:
diff --git a/engines/m4/riddle/rooms/section4/room405.cpp b/engines/m4/riddle/rooms/section4/room405.cpp
index 4c7eedde8dc..927f2ce6f69 100644
--- a/engines/m4/riddle/rooms/section4/room405.cpp
+++ b/engines/m4/riddle/rooms/section4/room405.cpp
@@ -580,12 +580,12 @@ void Room405::daemon() {
break;
case 667:
- series_stream_check_series(_response, 15);
+ series_set_frame_rate(_response, 15);
series_stream_break_on_frame(_response, 10, 668);
break;
case 668:
- series_stream_check_series(_response, 5);
+ series_set_frame_rate(_response, 5);
ws_OverrideCrunchTime(_response);
break;
diff --git a/engines/m4/riddle/rooms/section4/room410.cpp b/engines/m4/riddle/rooms/section4/room410.cpp
index 5828dbb227f..57a77bc2404 100644
--- a/engines/m4/riddle/rooms/section4/room410.cpp
+++ b/engines/m4/riddle/rooms/section4/room410.cpp
@@ -79,18 +79,18 @@ void Room410::daemon() {
case 104:
series_stream_break_on_frame(_pu, 102, 105);
- series_stream_check_series(_pu, 5);
+ series_set_frame_rate(_pu, 5);
digi_play("410r01", 1);
break;
case 105:
series_stream_break_on_frame(_pu, 116, 110);
- series_stream_check_series(_pu, 3000);
+ series_set_frame_rate(_pu, 3000);
digi_play("410t01", 1, 255, 106);
break;
case 106:
- series_stream_check_series(_pu, 7);
+ series_set_frame_rate(_pu, 7);
ws_OverrideCrunchTime(_pu);
break;
@@ -116,7 +116,7 @@ void Room410::daemon() {
break;
case 127:
- series_stream_check_series(_pu, 3000);
+ series_set_frame_rate(_pu, 3000);
break;
case 225:
@@ -128,7 +128,7 @@ void Room410::daemon() {
break;
case 300:
- series_stream_check_series(_pu, 3000);
+ series_set_frame_rate(_pu, 3000);
kernel_timing_trigger(1, 305);
disable_player_commands_and_fade_init(-1);
break;
diff --git a/engines/m4/riddle/rooms/section4/room493.cpp b/engines/m4/riddle/rooms/section4/room493.cpp
index 8dfac16e53c..1bd8f0bfd16 100644
--- a/engines/m4/riddle/rooms/section4/room493.cpp
+++ b/engines/m4/riddle/rooms/section4/room493.cpp
@@ -197,12 +197,12 @@ void Room493::escape_key_pressed(void *, void *) {
}
void Room493::setTrigger(int trigger) {
- series_stream_check_series(_credits, 30000);
+ series_set_frame_rate(_credits, 30000);
kernel_timing_trigger(900, trigger);
}
void Room493::crunch() {
- series_stream_check_series(_credits, 10);
+ series_set_frame_rate(_credits, 10);
ws_OverrideCrunchTime(_credits);
}
diff --git a/engines/m4/riddle/rooms/section5/room504.cpp b/engines/m4/riddle/rooms/section5/room504.cpp
index 73802f1738c..e394824b6cb 100644
--- a/engines/m4/riddle/rooms/section5/room504.cpp
+++ b/engines/m4/riddle/rooms/section5/room504.cpp
@@ -2093,7 +2093,7 @@ void Room504::daemon() {
break;
case 721:
- series_stream_check_series(_ripStep, 9999);
+ series_set_frame_rate(_ripStep, 9999);
kernel_timing_trigger(360, 722);
break;
@@ -2201,7 +2201,7 @@ void Room504::daemon() {
break;
case 742:
- series_stream_check_series(_ripStep, 9999);
+ series_set_frame_rate(_ripStep, 9999);
kernel_timing_trigger(360, 743);
break;
diff --git a/engines/m4/riddle/rooms/section5/room508.cpp b/engines/m4/riddle/rooms/section5/room508.cpp
index 354c4ed7f08..5385c4bbfae 100644
--- a/engines/m4/riddle/rooms/section5/room508.cpp
+++ b/engines/m4/riddle/rooms/section5/room508.cpp
@@ -238,7 +238,7 @@ void Room508::daemon() {
terminateMachineAndNull(_shovel);
terminateMachineAndNull(_skull);
terminateMachineAndNull(_ripley);
- series_stream_check_series(_ripStartTurnDome, 9999);
+ series_set_frame_rate(_ripStartTurnDome, 9999);
kernel_timing_trigger(1, 519);
break;
@@ -296,7 +296,7 @@ void Room508::daemon() {
sendWSMessage_10000(1, _x, _flick, 1, 2, -1, _flick, 1, 2, 0);
sendWSMessage_190000(_x, 1);
sendWSMessage_1a0000(_x, 1);
- series_stream_check_series(_spect, 5);
+ series_set_frame_rate(_spect, 5);
ws_OverrideCrunchTime(_spect);
break;
@@ -374,7 +374,7 @@ void Room508::daemon() {
break;
case 666:
- series_stream_check_series(_spect, 3000);
+ series_set_frame_rate(_spect, 3000);
hotspot_set_active("CRYSTAL SKULL ", true);
hotspot_set_active("SHOVEL ", true);
hotspot_set_active("SHOVEL", false);
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index 3ed0e34056a..33a50b430b1 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -899,17 +899,17 @@ void Room608::daemon() {
break;
case 505:
- series_stream_check_series(_ol2, 240);
+ series_set_frame_rate(_ol2, 240);
series_stream_break_on_frame(_ol2, 50, 506);
break;
case 506:
- series_stream_check_series(_ol2, 7);
+ series_set_frame_rate(_ol2, 7);
series_stream_break_on_frame(_ol2, 53, 508);
break;
case 507:
- series_stream_check_series(_ol2, 13);
+ series_set_frame_rate(_ol2, 13);
digi_play("608r47", 1);
break;
@@ -938,13 +938,13 @@ void Room608::daemon() {
break;
case 514:
- series_stream_check_series(_ol2, 300);
+ series_set_frame_rate(_ol2, 300);
kernel_timing_trigger(60, 555);
series_stream_break_on_frame(_ol2, 275, 515);
break;
case 515:
- series_stream_check_series(_ol2, 7);
+ series_set_frame_rate(_ol2, 7);
series_stream_break_on_frame(_ol2, 290, 516);
break;
@@ -1222,7 +1222,7 @@ void Room608::daemon() {
_ol2 = series_stream("608all5", 5, 0x600, 750);
series_stream_break_on_frame(_ol2, 21, 783);
- series_stream_check_series(_ol2, 10);
+ series_set_frame_rate(_ol2, 10);
break;
case 731:
@@ -1236,7 +1236,7 @@ void Room608::daemon() {
break;
case 734:
- series_stream_check_series(_ol2, 7);
+ series_set_frame_rate(_ol2, 7);
series_stream_break_on_frame(_ol2, 107, 792);
break;
diff --git a/engines/m4/riddle/rooms/section6/room615.cpp b/engines/m4/riddle/rooms/section6/room615.cpp
index 5cf9d155338..99c766bc637 100644
--- a/engines/m4/riddle/rooms/section6/room615.cpp
+++ b/engines/m4/riddle/rooms/section6/room615.cpp
@@ -102,7 +102,7 @@ void Room615::daemon() {
case 11:
if (_flag1) {
_flag1 = false;
- series_stream_check_series(_untie, 30000);
+ series_set_frame_rate(_untie, 30000);
digi_play("615r02", 1, 255, 15);
} else {
_flag1 = true;
@@ -123,7 +123,7 @@ void Room615::daemon() {
_flag1 = false;
_pu = series_stream("515PU02", 6, 0x100, 24);
series_stream_break_on_frame(_pu, 5, 22);
- series_stream_check_series(_pu, 4);
+ series_set_frame_rate(_pu, 4);
} else {
_flag1 = true;
}
@@ -136,7 +136,7 @@ void Room615::daemon() {
case 24:
if (_flag1) {
_flag1 = false;
- series_stream_check_series(_untie, 7);
+ series_set_frame_rate(_untie, 7);
ws_OverrideCrunchTime(_untie);
series_stream_break_on_frame(_untie, 144, 26);
digi_play("615t03", 1, 255, 25);
@@ -156,7 +156,7 @@ void Room615::daemon() {
case 26:
if (!_val1)
- series_stream_check_series(_untie, 3000);
+ series_set_frame_rate(_untie, 3000);
break;
case 40:
@@ -172,7 +172,7 @@ void Room615::daemon() {
_val1 = 1;
terminateMachineAndNull(_ripTalker);
- series_stream_check_series(_untie, 7);
+ series_set_frame_rate(_untie, 7);
ws_OverrideCrunchTime(_untie);
} else {
@@ -401,11 +401,11 @@ void Room615::daemon() {
case 116:
series_stream_break_on_frame(_untie, 58, 150);
- series_stream_check_series(_untie, 30000);
+ series_set_frame_rate(_untie, 30000);
break;
case 118:
- series_stream_check_series(_untie, 6);
+ series_set_frame_rate(_untie, 6);
ws_OverrideCrunchTime(_untie);
digi_play("615t10", 1, 255, 119);
break;
@@ -414,7 +414,7 @@ void Room615::daemon() {
_val2 = 1;
if (_val2) {
- series_stream_check_series(_untie, 6);
+ series_set_frame_rate(_untie, 6);
ws_OverrideCrunchTime(_untie);
} else {
kernel_timing_trigger(10, 151);
@@ -481,7 +481,7 @@ void Room615::daemon() {
break;
case 135:
- series_stream_check_series(_untie, 400);
+ series_set_frame_rate(_untie, 400);
kernel_timing_trigger(60, 140);
break;
@@ -499,14 +499,14 @@ void Room615::daemon() {
case 150:
if (!_val2) {
- series_stream_check_series(_untie, 30000);
+ series_set_frame_rate(_untie, 30000);
kernel_timing_trigger(10, 151);
}
break;
case 151:
if (_val2) {
- series_stream_check_series(_untie, 6);
+ series_set_frame_rate(_untie, 6);
ws_OverrideCrunchTime(_untie);
} else {
kernel_timing_trigger(10, 151);
diff --git a/engines/m4/riddle/rooms/section9/room908.cpp b/engines/m4/riddle/rooms/section9/room908.cpp
index 18f5d93dd60..4cbe6618857 100644
--- a/engines/m4/riddle/rooms/section9/room908.cpp
+++ b/engines/m4/riddle/rooms/section9/room908.cpp
@@ -109,73 +109,73 @@ void Room908::daemon() {
case 74:
series_stream_break_on_frame(_roomStates_field4, 59, 75);
- series_stream_check_series(_roomStates_field4, 9);
+ series_set_frame_rate(_roomStates_field4, 9);
digi_play("908r01", 2, 255, -1, 908);
break;
case 75:
series_stream_break_on_frame(_roomStates_field4, 66, 76);
- series_stream_check_series(_roomStates_field4, 8);
+ series_set_frame_rate(_roomStates_field4, 8);
digi_play("908r01a", 2, 255, -1, 908);
break;
case 76:
series_stream_break_on_frame(_roomStates_field4, 82, 77);
- series_stream_check_series(_roomStates_field4, 10);
+ series_set_frame_rate(_roomStates_field4, 10);
digi_play("908r01b", 2, 255, -1, 908);
break;
case 77:
series_stream_break_on_frame(_roomStates_field4, 95, 78);
- series_stream_check_series(_roomStates_field4, 8);
+ series_set_frame_rate(_roomStates_field4, 8);
digi_play("908m02", 2, 255, -1, 908);
break;
case 78:
series_stream_break_on_frame(_roomStates_field4, 121, 79);
- series_stream_check_series(_roomStates_field4, 9);
+ series_set_frame_rate(_roomStates_field4, 9);
digi_play("908r02", 2, 255, -1, 908);
break;
case 79:
series_stream_break_on_frame(_roomStates_field4, 138, 80);
- series_stream_check_series(_roomStates_field4, 8);
+ series_set_frame_rate(_roomStates_field4, 8);
digi_play("908m03", 2, 255, -1, 908);
break;
case 80:
series_stream_break_on_frame(_roomStates_field4, 158, 82);
- series_stream_check_series(_roomStates_field4, 9);
+ series_set_frame_rate(_roomStates_field4, 9);
digi_play("908m04", 2, 255, -1, 908);
break;
case 82:
series_stream_break_on_frame(_roomStates_field4, 175, 83);
- series_stream_check_series(_roomStates_field4, 10);
+ series_set_frame_rate(_roomStates_field4, 10);
digi_play("908r03", 2, 255, -1, 908);
break;
case 83:
series_stream_break_on_frame(_roomStates_field4, 192, 84);
- series_stream_check_series(_roomStates_field4, 9);
+ series_set_frame_rate(_roomStates_field4, 9);
digi_play("908r03a", 2, 255, -1, 908);
break;
case 84:
series_stream_break_on_frame(_roomStates_field4, 200, 85);
- series_stream_check_series(_roomStates_field4, 8);
+ series_set_frame_rate(_roomStates_field4, 8);
digi_play("908m05", 2, 255, -1, 908);
break;
case 85:
series_stream_break_on_frame(_roomStates_field4, 233, 86);
- series_stream_check_series(_roomStates_field4, 9);
+ series_set_frame_rate(_roomStates_field4, 9);
digi_play("908m05a", 2, 255, -1, 908);
break;
case 86:
series_stream_break_on_frame(_roomStates_field4, 250, 87);
- series_stream_check_series(_roomStates_field4, 8);
+ series_set_frame_rate(_roomStates_field4, 8);
digi_play("909m01", 2, 255, -1, 909);
break;
@@ -185,12 +185,12 @@ void Room908::daemon() {
break;
case 88:
- series_stream_check_series(_roomStates_field4, 85);
+ series_set_frame_rate(_roomStates_field4, 85);
series_stream_break_on_frame(_roomStates_field4, 252, 89);
break;
case 89:
- series_stream_check_series(_roomStates_field4, 8);
+ series_set_frame_rate(_roomStates_field4, 8);
series_stream_break_on_frame(_roomStates_field4, 259, 91);
break;
@@ -211,7 +211,7 @@ void Room908::daemon() {
case 94:
series_stream_break_on_frame(_roomStates_field4, 339, -1);
- series_stream_check_series(_roomStates_field4, 10);
+ series_set_frame_rate(_roomStates_field4, 10);
digi_play("912k01", 2, 255, 95, 912);
break;
diff --git a/engines/m4/riddle/rooms/section9/room918.cpp b/engines/m4/riddle/rooms/section9/room918.cpp
index ca5566437fc..a5156a561a5 100644
--- a/engines/m4/riddle/rooms/section9/room918.cpp
+++ b/engines/m4/riddle/rooms/section9/room918.cpp
@@ -76,25 +76,25 @@ void Room918::daemon() {
case 30:
series_stream_break_on_frame(_roomStates_field4, 64, 40);
- series_stream_check_series(_roomStates_field4, 6);
+ series_set_frame_rate(_roomStates_field4, 6);
digi_play("908R04", 1, 255, -1, 908);
break;
case 40:
series_stream_break_on_frame(_roomStates_field4, 103, 50);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908m07", 1, 255, -1, 908);
break;
case 50:
series_stream_break_on_frame(_roomStates_field4, 121, 60);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908r05", 1, 255, -1, 908);
break;
case 60:
series_stream_break_on_frame(_roomStates_field4, 133, 70);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908r05a", 1, 255, -1, 908);
break;
@@ -109,68 +109,68 @@ void Room918::daemon() {
break;
case 80:
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
series_stream_break_on_frame(_roomStates_field4, 210, 90);
digi_play("908m08a", 2, 255, -1, 908);
break;
case 90:
series_stream_break_on_frame(_roomStates_field4, 245, 100);
- series_stream_check_series(_roomStates_field4, 6);
+ series_set_frame_rate(_roomStates_field4, 6);
digi_play("908r06", 1, 255, -1, 908);
break;
case 100:
series_stream_break_on_frame(_roomStates_field4, 271, 102);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908m09", 2, 255, -1, 908);
break;
case 102:
series_stream_break_on_frame(_roomStates_field4, 291, 104);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908m09a", 2, 255, -1, 908);
break;
case 104:
series_stream_break_on_frame(_roomStates_field4, 326, 110);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908m09b", 2, 255, -1, 908);
break;
case 110:
series_stream_break_on_frame(_roomStates_field4, 333, 112);
- series_stream_check_series(_roomStates_field4, 6);
+ series_set_frame_rate(_roomStates_field4, 6);
digi_play("908r07", 1, 255, -1, 908);
break;
case 112:
series_stream_break_on_frame(_roomStates_field4, 339, 114);
- series_stream_check_series(_roomStates_field4, 6);
+ series_set_frame_rate(_roomStates_field4, 6);
digi_play("908r07a", 1, 255, -1, 908);
break;
case 114:
series_stream_break_on_frame(_roomStates_field4, 354, 116);
- series_stream_check_series(_roomStates_field4, 6);
+ series_set_frame_rate(_roomStates_field4, 6);
digi_play("908r07b", 1, 255, -1, 908);
break;
case 116:
series_stream_break_on_frame(_roomStates_field4, 382, 120);
- series_stream_check_series(_roomStates_field4, 6);
+ series_set_frame_rate(_roomStates_field4, 6);
digi_play("908r07c", 1, 255, -1, 908);
break;
case 120:
series_stream_break_on_frame(_roomStates_field4, 390, 122);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908m10", 2, 255, -1, 908);
break;
case 122:
series_stream_break_on_frame(_roomStates_field4, 435, 130);
- series_stream_check_series(_roomStates_field4, 5);
+ series_set_frame_rate(_roomStates_field4, 5);
digi_play("908m10a", 2, 255, -1, 908);
break;
@@ -189,7 +189,7 @@ void Room918::daemon() {
break;
case 300:
- series_stream_check_series(_roomStates_field4, 7);
+ series_set_frame_rate(_roomStates_field4, 7);
series_stream_break_on_frame(_roomStates_field4, 486, 320);
digi_play("950_s48f", 2, 255, 310, -1);
break;
More information about the Scummvm-git-logs
mailing list