[Scummvm-git-logs] scummvm master -> 52b2771a341a63d3db45ae460d9de6b921772b29
Strangerke
noreply at scummvm.org
Wed Mar 12 22:22:16 UTC 2025
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f25f37becf M4: RIDDLE: Some cleanup in rooms 6xx (maze on eastern island)
5d2e77631c M4: RIDDLE: cleanup in section6_maze, fix a bug present in the original (look at statue)
1e9a23494d M4: RIDDLE: Fix left exit in room 607
c43cace398 M4: RIDDLE: More cleanup in maze and in core/room
52b2771a34 M4: RIDDLE: Some cleanup in room 603
Commit: f25f37becfb256b20dee2a2328d813f905f22ac2
https://github.com/scummvm/scummvm/commit/f25f37becfb256b20dee2a2328d813f905f22ac2
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-12T23:21:47+01:00
Commit Message:
M4: RIDDLE: Some cleanup in rooms 6xx (maze on eastern island)
Changed paths:
engines/m4/riddle/rooms/section6/room603.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/room651.cpp
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index 1323ff2ad95..7f61c0f5e00 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -1715,7 +1715,7 @@ void Room603::conv603a() {
sendWSMessage_60000(_tt);
_ttShadow = series_show("tt walker shadow 4", 0xf00, 0, -1, -1, 0, 53, 291, 293);
_trigger1 = 400;
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, false,
triggerMachineByHashCallback, "tt");
_G(kernel).trigger_mode = KT_DAEMON;
sendWSMessage_10000(1, _tt, _tt03, 110, 122, 400, _ttD01, 1, 1, 0);
@@ -1729,7 +1729,7 @@ void Room603::conv603a() {
case 16:
ws_hide_walker();
_val2 = 1;
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 345, 300, -56, 0x100, 1,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 345, 300, -56, 0x100, true,
triggerMachineByHashCallback, "rip");
_shadow = series_show("safari shadow 2", 0xf00, 128, -1, -1, 0, 56, 345, 300);
_G(kernel).trigger_mode = KT_DAEMON;
diff --git a/engines/m4/riddle/rooms/section6/room644.cpp b/engines/m4/riddle/rooms/section6/room644.cpp
index 58191a2d345..159f48f8167 100644
--- a/engines/m4/riddle/rooms/section6/room644.cpp
+++ b/engines/m4/riddle/rooms/section6/room644.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room644.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
@@ -68,7 +67,7 @@ void Room644::parser() {
} else {
if (_G(kernel).trigger == 6)
_G(flags)[V207] = 1;
- sketchInJournal(0);
+ sketchInJournal(nullptr);
}
_G(player).command_ready = false;
diff --git a/engines/m4/riddle/rooms/section6/room645.cpp b/engines/m4/riddle/rooms/section6/room645.cpp
index 6fce661d12d..2e2995e1868 100644
--- a/engines/m4/riddle/rooms/section6/room645.cpp
+++ b/engines/m4/riddle/rooms/section6/room645.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room645.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room646.cpp b/engines/m4/riddle/rooms/section6/room646.cpp
index 131d17f3cda..4a81c9202d9 100644
--- a/engines/m4/riddle/rooms/section6/room646.cpp
+++ b/engines/m4/riddle/rooms/section6/room646.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room646.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room647.cpp b/engines/m4/riddle/rooms/section6/room647.cpp
index 8559a68f2ae..b1b350fa224 100644
--- a/engines/m4/riddle/rooms/section6/room647.cpp
+++ b/engines/m4/riddle/rooms/section6/room647.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room647.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room651.cpp b/engines/m4/riddle/rooms/section6/room651.cpp
index 752853277ae..319c729c24e 100644
--- a/engines/m4/riddle/rooms/section6/room651.cpp
+++ b/engines/m4/riddle/rooms/section6/room651.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room651.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
@@ -65,7 +64,7 @@ void Room651::parser() {
} else {
if (_G(kernel).trigger == 6)
_G(flags)[V201] = 1;
- sketchInJournal(0);
+ sketchInJournal(nullptr);
}
_G(player).command_ready = false;
Commit: 5d2e77631c91e205bf811ec6df9eeee712567d96
https://github.com/scummvm/scummvm/commit/5d2e77631c91e205bf811ec6df9eeee712567d96
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-12T23:21:48+01:00
Commit Message:
M4: RIDDLE: cleanup in section6_maze, fix a bug present in the original (look at statue)
Changed paths:
engines/m4/riddle/rooms/section6/section6_maze.cpp
diff --git a/engines/m4/riddle/rooms/section6/section6_maze.cpp b/engines/m4/riddle/rooms/section6/section6_maze.cpp
index 91b1a91a534..6d701944a1c 100644
--- a/engines/m4/riddle/rooms/section6/section6_maze.cpp
+++ b/engines/m4/riddle/rooms/section6/section6_maze.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/section6_maze.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
@@ -39,10 +38,10 @@ void Maze::daemon() {
}
void Maze::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool takeFlag = player_said("take");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool takeFlag = player_said("take");
- if (player_said("gear") && player_said("STATUE")) {
+ if ((player_said("gear") || lookFlag) && player_said("STATUE")) {
digi_play("623R02", 1, 255, -1, 623);
} else if (lookFlag && player_said("RED BOULDER")) {
digi_play("623R01", 1, 255, -1, 623);
Commit: 1e9a23494d58710f45800bf51f4da382185782ba
https://github.com/scummvm/scummvm/commit/1e9a23494d58710f45800bf51f4da382185782ba
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-12T23:21:48+01:00
Commit Message:
M4: RIDDLE: Fix left exit in room 607
Changed paths:
engines/m4/riddle/rooms/section6/room607.cpp
diff --git a/engines/m4/riddle/rooms/section6/room607.cpp b/engines/m4/riddle/rooms/section6/room607.cpp
index 3b68ac61e8c..cccea764313 100644
--- a/engines/m4/riddle/rooms/section6/room607.cpp
+++ b/engines/m4/riddle/rooms/section6/room607.cpp
@@ -107,9 +107,9 @@ void Room607::daemon() {
}
void Room607::pre_parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool takeFlag = player_said("take");
- bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (useFlag && player_said("GREY ROCK") && !_G(flags)[V193])
_G(player).resetWalk();
@@ -120,9 +120,9 @@ void Room607::pre_parser() {
}
void Room607::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool takeFlag = player_said("take");
- bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (lookFlag && player_said("FISSURE") && inv_object_is_here("RONGORONGO TABLET")) {
hotspot_set_active("RONGORONGO TABLET", true);
@@ -318,7 +318,7 @@ void Room607::parser() {
}
} else if (useFlag && player_said("RED BOULDER")) {
digi_play("607r10", 1);
- } else if (player_said("left") ) {
+ } else if (player_said("left") && left()) {
// No implementation
} else if (player_said("right") && right()) {
// No implementation
Commit: c43cace39886d87a6508f511f06086d598988007
https://github.com/scummvm/scummvm/commit/c43cace39886d87a6508f511f06086d598988007
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-12T23:21:48+01:00
Commit Message:
M4: RIDDLE: More cleanup in maze and in core/room
Changed paths:
engines/m4/core/rooms.cpp
engines/m4/riddle/rooms/section6/room615.cpp
engines/m4/riddle/rooms/section6/room620.cpp
engines/m4/riddle/rooms/section6/room621.cpp
engines/m4/riddle/rooms/section6/room622.cpp
engines/m4/riddle/rooms/section6/room623.cpp
engines/m4/riddle/rooms/section6/room624.cpp
engines/m4/riddle/rooms/section6/room625.cpp
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/room648.cpp
engines/m4/riddle/rooms/section6/room649.cpp
engines/m4/riddle/rooms/section6/room650.cpp
diff --git a/engines/m4/core/rooms.cpp b/engines/m4/core/rooms.cpp
index 832047bef4c..70391cc2bfa 100644
--- a/engines/m4/core/rooms.cpp
+++ b/engines/m4/core/rooms.cpp
@@ -52,7 +52,7 @@ void Room::parser() {
void Sections::global_section_constructor() {
- uint sectionNum = _G(game).new_section;
+ const uint sectionNum = _G(game).new_section;
assert(sectionNum >= 1 && sectionNum <= 9);
_activeSection = _sections[sectionNum - 1];
@@ -242,10 +242,9 @@ void Sections::get_ipl() {
delete _G(inverse_pal);
_G(inverse_pal) = nullptr;
- char *name;
Common::String filename;
- name = env_find(_G(currentSceneDef).art_base);
+ char *name = env_find(_G(currentSceneDef).art_base);
if (name) {
// Means found in database
filename = f_extension_new(name, "ipl");
@@ -310,11 +309,11 @@ void Sections::game_control_cycle() {
if (_G(player).walker_in_this_scene && _G(camera_reacts_to_player) &&
_G(gameDrawBuff)->w > 640 && _G(my_walker)) {
- int xp = (_G(my_walker)->myAnim8->myRegs[IDX_X] >> 16) + screen->x1;
+ const int xp = (_G(my_walker)->myAnim8->myRegs[IDX_X] >> 16) + screen->x1;
if (xp > 560 && _cameraShiftAmount >= 0) {
_cameraShiftAmount += screen->x1 - 427;
- int xv = _cameraShiftAmount + _G(gameDrawBuff)->w - 1;
+ const int xv = _cameraShiftAmount + _G(gameDrawBuff)->w - 1;
if (xv < 639)
_cameraShiftAmount = -(_G(gameDrawBuff)->w - 640);
@@ -369,7 +368,6 @@ void Sections::parse_player_command_now() {
void Sections::pal_game_task() {
int32 status;
- bool updateVideo;
int delta = 0;
Common::String line;
@@ -385,7 +383,7 @@ void Sections::pal_game_task() {
g_vars->getHotkeys()->toggle_through_cursors(change);
}
- updateVideo = !_cameraShiftAmount && !_cameraShift_vert_Amount;
+ const bool updateVideo = !_cameraShiftAmount && !_cameraShift_vert_Amount;
cycleEngines(_G(game_bgBuff)->get_buffer(), &(_G(currentSceneDef).depth_table[0]),
_G(screenCodeBuff)->get_buffer(), (uint8 *)&_G(master_palette)[0], _G(inverse_pal)->get_ptr(), updateVideo);
diff --git a/engines/m4/riddle/rooms/section6/room615.cpp b/engines/m4/riddle/rooms/section6/room615.cpp
index b4347e80837..6e1d115f374 100644
--- a/engines/m4/riddle/rooms/section6/room615.cpp
+++ b/engines/m4/riddle/rooms/section6/room615.cpp
@@ -147,7 +147,7 @@ void Room615::daemon() {
case 25:
_flag1 = false;
- _ripTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 393, 361, 97, 256, 1,
+ _ripTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 393, 361, 97, 256, true,
triggerMachineByHashCallback, "rip talker");
sendWSMessage_10000(1, _ripTalker, _ripTalk, 1, 1, 40, _ripTalk, 1, 7, 4);
sendWSMessage_1a0000(_ripTalker, 11);
@@ -196,7 +196,7 @@ void Room615::daemon() {
392, 361, 10, triggerMachineByHashCallback3000, "rip");
sendWSMessage_10000(_pu, 426, 347, 9, 50, 1);
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "untie tt");
sendWSMessage_10000(1, _tt, _loop7, 1, 1, 50, _loop7, 1, 5, 1);
sendWSMessage_1a0000(_tt, 15);
@@ -227,7 +227,7 @@ void Room615::daemon() {
break;
case 57:
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "x");
sendWSMessage_10000(1, _tt, _loop0, 1, 1, 60, _loop0, 1, 5, 1);
sendWSMessage_1a0000(_tt, 13);
@@ -249,7 +249,7 @@ void Room615::daemon() {
break;
case 65:
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "spleen");
sendWSMessage_10000(1, _tt, _loop1, 1, 1, 75, _loop1, 1, 7, 1);
sendWSMessage_1a0000(_tt, 13);
@@ -269,7 +269,7 @@ void Room615::daemon() {
case 80:
if (_ctr1 >= 1) {
_ctr1 = 0;
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "spleen");
sendWSMessage_10000(1, _tt, _loop2, 1, 1, 85, _loop2, 1, 9, 1);
sendWSMessage_1a0000(_tt, 13);
@@ -334,12 +334,12 @@ void Room615::daemon() {
case 102:
if (_ctr1 >= 1) {
_ctr1 = 0;
- _untie = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _untie = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "spleen");
sendWSMessage_10000(1, _untie, _loop5, 1, 1, 105, _loop5, 1, 5, 1);
sendWSMessage_1a0000(_untie, 15);
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "spleen");
sendWSMessage_10000(1, _tt, _loop6, 1, 1, 105, _loop6, 1, 1, 1);
digi_play("615r09", 1, 255, 105);
@@ -423,13 +423,13 @@ void Room615::daemon() {
case 120:
midi_play("love", 255, 0, -1, 949);
- _untie = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _untie = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "spleen");
sendWSMessage_10000(1, _untie, _loop5, 1, 1, 125, _loop5, 1, 1, 1);
sendWSMessage_190000(_untie, 15);
sendWSMessage_1a0000(_untie, 15);
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
triggerMachineByHashCallback, "spleen");
sendWSMessage_10000(1, _tt, _loop7, 1, 1, 125, _loop7, 1, 5, 1);
sendWSMessage_1a0000(_tt, 13);
diff --git a/engines/m4/riddle/rooms/section6/room620.cpp b/engines/m4/riddle/rooms/section6/room620.cpp
index a33276e9106..98ec11f60e6 100644
--- a/engines/m4/riddle/rooms/section6/room620.cpp
+++ b/engines/m4/riddle/rooms/section6/room620.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room620.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room621.cpp b/engines/m4/riddle/rooms/section6/room621.cpp
index f6efc8aa559..a2c2221bb5b 100644
--- a/engines/m4/riddle/rooms/section6/room621.cpp
+++ b/engines/m4/riddle/rooms/section6/room621.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room621.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room622.cpp b/engines/m4/riddle/rooms/section6/room622.cpp
index 9e252c1d393..eda647ace34 100644
--- a/engines/m4/riddle/rooms/section6/room622.cpp
+++ b/engines/m4/riddle/rooms/section6/room622.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room622.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room623.cpp b/engines/m4/riddle/rooms/section6/room623.cpp
index ad8fa97f0af..65b2578816f 100644
--- a/engines/m4/riddle/rooms/section6/room623.cpp
+++ b/engines/m4/riddle/rooms/section6/room623.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room623.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room624.cpp b/engines/m4/riddle/rooms/section6/room624.cpp
index 6c3eaf352e2..bbf18fe03a2 100644
--- a/engines/m4/riddle/rooms/section6/room624.cpp
+++ b/engines/m4/riddle/rooms/section6/room624.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room624.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room625.cpp b/engines/m4/riddle/rooms/section6/room625.cpp
index a9c9176b026..e733c3822d7 100644
--- a/engines/m4/riddle/rooms/section6/room625.cpp
+++ b/engines/m4/riddle/rooms/section6/room625.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room625.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
@@ -60,7 +59,7 @@ void Room625::parser() {
} else {
if (_G(kernel).trigger == 6)
_G(flags)[V208] = 1;
- sketchInJournal(0);
+ sketchInJournal(nullptr);
}
_G(player).command_ready = false;
diff --git a/engines/m4/riddle/rooms/section6/room626.cpp b/engines/m4/riddle/rooms/section6/room626.cpp
index c301b55d9e6..d8b19ee66b3 100644
--- a/engines/m4/riddle/rooms/section6/room626.cpp
+++ b/engines/m4/riddle/rooms/section6/room626.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room626.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
@@ -66,7 +65,7 @@ void Room626::parser() {
} else {
if (_G(kernel).trigger == 6)
_G(flags)[V209] = 1;
- sketchInJournal(0);
+ sketchInJournal(nullptr);
}
_G(player).command_ready = false;
diff --git a/engines/m4/riddle/rooms/section6/room627.cpp b/engines/m4/riddle/rooms/section6/room627.cpp
index b95e94bbe72..88e1919f402 100644
--- a/engines/m4/riddle/rooms/section6/room627.cpp
+++ b/engines/m4/riddle/rooms/section6/room627.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room627.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room628.cpp b/engines/m4/riddle/rooms/section6/room628.cpp
index 5ba2b86ba06..179f3f68ff5 100644
--- a/engines/m4/riddle/rooms/section6/room628.cpp
+++ b/engines/m4/riddle/rooms/section6/room628.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room628.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room629.cpp b/engines/m4/riddle/rooms/section6/room629.cpp
index b36bcb87555..afb36cc9f45 100644
--- a/engines/m4/riddle/rooms/section6/room629.cpp
+++ b/engines/m4/riddle/rooms/section6/room629.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room629.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room630.cpp b/engines/m4/riddle/rooms/section6/room630.cpp
index 24e8f3d8d0b..5e2e9860e72 100644
--- a/engines/m4/riddle/rooms/section6/room630.cpp
+++ b/engines/m4/riddle/rooms/section6/room630.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room630.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room631.cpp b/engines/m4/riddle/rooms/section6/room631.cpp
index 3fbe5a9a3f3..7e24be98007 100644
--- a/engines/m4/riddle/rooms/section6/room631.cpp
+++ b/engines/m4/riddle/rooms/section6/room631.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room631.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room632.cpp b/engines/m4/riddle/rooms/section6/room632.cpp
index f1b4bdf3c61..4383f3abe57 100644
--- a/engines/m4/riddle/rooms/section6/room632.cpp
+++ b/engines/m4/riddle/rooms/section6/room632.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room632.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room633.cpp b/engines/m4/riddle/rooms/section6/room633.cpp
index 9207a701236..8f06a6e4801 100644
--- a/engines/m4/riddle/rooms/section6/room633.cpp
+++ b/engines/m4/riddle/rooms/section6/room633.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room633.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room634.cpp b/engines/m4/riddle/rooms/section6/room634.cpp
index 10f96f28c33..71ddbd71420 100644
--- a/engines/m4/riddle/rooms/section6/room634.cpp
+++ b/engines/m4/riddle/rooms/section6/room634.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room634.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room635.cpp b/engines/m4/riddle/rooms/section6/room635.cpp
index a7e20d2ef40..86fbf9a8e44 100644
--- a/engines/m4/riddle/rooms/section6/room635.cpp
+++ b/engines/m4/riddle/rooms/section6/room635.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room635.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room636.cpp b/engines/m4/riddle/rooms/section6/room636.cpp
index 004bff95a26..f59585411c0 100644
--- a/engines/m4/riddle/rooms/section6/room636.cpp
+++ b/engines/m4/riddle/rooms/section6/room636.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room636.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room637.cpp b/engines/m4/riddle/rooms/section6/room637.cpp
index 6c656e57f59..362ec34869f 100644
--- a/engines/m4/riddle/rooms/section6/room637.cpp
+++ b/engines/m4/riddle/rooms/section6/room637.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room637.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room638.cpp b/engines/m4/riddle/rooms/section6/room638.cpp
index 167f6d175a7..c8a16fdc739 100644
--- a/engines/m4/riddle/rooms/section6/room638.cpp
+++ b/engines/m4/riddle/rooms/section6/room638.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room638.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room640.cpp b/engines/m4/riddle/rooms/section6/room640.cpp
index 2cf81c40adc..571a061d211 100644
--- a/engines/m4/riddle/rooms/section6/room640.cpp
+++ b/engines/m4/riddle/rooms/section6/room640.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room640.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room641.cpp b/engines/m4/riddle/rooms/section6/room641.cpp
index e132aa27d1e..7f13d1ab2df 100644
--- a/engines/m4/riddle/rooms/section6/room641.cpp
+++ b/engines/m4/riddle/rooms/section6/room641.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room641.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room642.cpp b/engines/m4/riddle/rooms/section6/room642.cpp
index 9fbe4387f2f..ad802a63026 100644
--- a/engines/m4/riddle/rooms/section6/room642.cpp
+++ b/engines/m4/riddle/rooms/section6/room642.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room642.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room643.cpp b/engines/m4/riddle/rooms/section6/room643.cpp
index a17042ffc51..680d7273e88 100644
--- a/engines/m4/riddle/rooms/section6/room643.cpp
+++ b/engines/m4/riddle/rooms/section6/room643.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room643.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room648.cpp b/engines/m4/riddle/rooms/section6/room648.cpp
index f3c4862814f..65a442b4de2 100644
--- a/engines/m4/riddle/rooms/section6/room648.cpp
+++ b/engines/m4/riddle/rooms/section6/room648.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room648.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room649.cpp b/engines/m4/riddle/rooms/section6/room649.cpp
index af51b9e79f2..05923255ca1 100644
--- a/engines/m4/riddle/rooms/section6/room649.cpp
+++ b/engines/m4/riddle/rooms/section6/room649.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room649.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room650.cpp b/engines/m4/riddle/rooms/section6/room650.cpp
index c27b4ccc29e..536080e12cd 100644
--- a/engines/m4/riddle/rooms/section6/room650.cpp
+++ b/engines/m4/riddle/rooms/section6/room650.cpp
@@ -20,7 +20,6 @@
*/
#include "m4/riddle/rooms/section6/room650.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
namespace M4 {
Commit: 52b2771a341a63d3db45ae460d9de6b921772b29
https://github.com/scummvm/scummvm/commit/52b2771a341a63d3db45ae460d9de6b921772b29
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-12T23:21:49+01:00
Commit Message:
M4: RIDDLE: Some cleanup in room 603
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 7f61c0f5e00..1e26d50b981 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -1336,7 +1336,7 @@ void Room603::parser() {
player_set_commands_allowed(false);
ws_hide_walker();
_val2 = 1;
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 345, 300, -56, 0x100, 1,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 345, 300, -56, 0x100, true,
triggerMachineByHashCallback, "rip");
_shadow = series_show("safari shadow 2", 0xf00, 128, -1, -1, 0, 56, 345, 300);
_G(kernel).trigger_mode = KT_DAEMON;
@@ -1355,7 +1355,7 @@ void Room603::parser() {
player_set_commands_allowed(false);
ws_hide_walker();
_val2 = 1;
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 311, 308, -59, 0x100, 1,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 311, 308, -59, 0x100, true,
triggerMachineByHashCallback, "rip");
_shadow = series_show("safari shadow 2", 0xf00, 128, -1, -1, 0, 59, 311, 308);
@@ -1925,7 +1925,7 @@ bool Room603::takeSleeve() {
case 2:
hotspot_set_active("SLEEVE", false);
inv_give_to_player("SLEEVE");
- kernel_examine_inventory_object("ping sleeve", 5, 1, 280, 220, 3, 0, -1);
+ kernel_examine_inventory_object("ping sleeve", 5, 1, 280, 220, 3, nullptr, -1);
terminateMachineAndNull(_sleeve);
return true;
More information about the Scummvm-git-logs
mailing list