[Scummvm-git-logs] scummvm master -> 7c733c3d55450c9285956f5ed3860dc210227eb5
Strangerke
noreply at scummvm.org
Sun Feb 16 21:33:19 UTC 2025
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:
e1b03114f8 M4: RIDDLE: Fix CID 1561182 + add some const in room 506
4644b266a1 M4: RIDDLE: Fix bug pointed by CID 1559357 + add some const and fix some booleans in room 305
7c733c3d55 M4: RIDDLE: Remove (and document) logically dead code (CID 1562470 ), remove duplicate case in switch, fix some const an
Commit: e1b03114f8586ffc61e0d80432d6e2682b6ad411
https://github.com/scummvm/scummvm/commit/e1b03114f8586ffc61e0d80432d6e2682b6ad411
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-16T22:02:23+01:00
Commit Message:
M4: RIDDLE: Fix CID 1561182 + add some const in room 506
Changed paths:
engines/m4/riddle/rooms/section5/room506.cpp
engines/m4/riddle/rooms/section5/room506.h
diff --git a/engines/m4/riddle/rooms/section5/room506.cpp b/engines/m4/riddle/rooms/section5/room506.cpp
index 64204625afe..40de94a9167 100644
--- a/engines/m4/riddle/rooms/section5/room506.cpp
+++ b/engines/m4/riddle/rooms/section5/room506.cpp
@@ -204,9 +204,9 @@ void Room506::pre_parser() {
}
void Room506::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool takeFlag = player_said("take");
- bool useFlag = player_said("gear");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said("gear");
if (takeFlag && player_said("CLUMP OF VINES")) {
switch (_G(kernel).trigger) {
@@ -426,9 +426,9 @@ void Room506::setupPalette() {
hotspot_set_active(" ", false);
for (int i = 0; i < PALETTE_BLOCK; ++i) {
- int palR = MAX(_G(master_palette)[7 + i].r - 100, 0);
- int palG = MAX(_G(master_palette)[7 + i].g - 100, 0);
- int palB = MAX(_G(master_palette)[7 + i].b - 100, 0);
+ const int palR = MAX(_G(master_palette)[7 + i].r - 100, 0);
+ const int palG = MAX(_G(master_palette)[7 + i].g - 100, 0);
+ const int palB = MAX(_G(master_palette)[7 + i].b - 100, 0);
_G(master_palette)[7 + i].r = palR;
_G(master_palette)[7 + i].g = palG;
diff --git a/engines/m4/riddle/rooms/section5/room506.h b/engines/m4/riddle/rooms/section5/room506.h
index 3310813620d..4a7d479c9d2 100644
--- a/engines/m4/riddle/rooms/section5/room506.h
+++ b/engines/m4/riddle/rooms/section5/room506.h
@@ -30,7 +30,7 @@ namespace Rooms {
class Room506 : public Room {
private:
- RGB8 _palette[39];
+ RGB8 _palette[39] = {};
bool _flag1 = false;
bool _flag2 = false;
bool _flag3 = false;
Commit: 4644b266a16c98be33f496e53ced1d19a9786a6d
https://github.com/scummvm/scummvm/commit/4644b266a16c98be33f496e53ced1d19a9786a6d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-16T22:02:23+01:00
Commit Message:
M4: RIDDLE: Fix bug pointed by CID 1559357 + add some const and fix some booleans in room 305
Changed paths:
engines/m4/riddle/rooms/section3/room305.cpp
diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 20acac84487..708e0512d58 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -273,7 +273,7 @@ void Room305::daemon() {
case 42:
sendWSMessage_60000(_stander);
- _stander = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 494, 278, 73, 0xf00, 1,
+ _stander = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 494, 278, 73, 0xf00, true,
triggerMachineByHashCallback, "fl stander");
_G(kernel).trigger_mode = KT_DAEMON;
sendWSMessage_10000(1, _stander, _feng3, 1, 1, 400, _feng3, 1, 6, 1);
@@ -293,7 +293,7 @@ void Room305::daemon() {
if (_showWalker) {
ws_unhide_walker();
- _showWalker = 0;
+ _showWalker = false;
}
}
@@ -573,8 +573,8 @@ void Room305::daemon() {
}
void Room305::pre_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 (_drawerOpen && !(takeFlag && player_said("turtle treats"))
&& !(lookFlag && player_said("turtle treats"))) {
@@ -617,9 +617,9 @@ void Room305::pre_parser() {
}
void Room305::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");
bool itemFlag = false;
bool chiselFlag = false;
bool caseFlag = false;
@@ -915,14 +915,15 @@ next4:
case -1:
case 1: {
player_set_commands_allowed(true);
- int area = getXAreaNum();
- const int32 flags[8] = {
+ const int area = getXAreaNum();
+ const int32 flags[9] = {
_G(flags)[kEasterIslandCartoon], _G(flags)[kChinshiCartoon],
_G(flags)[kTabletsCartoon], _G(flags)[kEpitaphCartoon],
_G(flags)[kGraveyardCartoon], _G(flags)[kCastleCartoon],
- _G(flags)[kMocaMocheCartoon], _G(flags)[kTempleCartoon]
+ _G(flags)[kMocaMocheCartoon], _G(flags)[kTempleCartoon],
+ _G(flags)[kEmeraldCartoon]
};
- bool flag = flags[area - 1] != 0;
+ const bool flag = flags[area - 1] != 0;
if (flag && (area == 3 || area == 9))
player_set_commands_allowed(true);
@@ -1232,9 +1233,9 @@ void Room305::setShadow5(bool active) {
}
void Room305::conv305a() {
- int who = conv_whos_talking();
- int node = conv_current_node();
- int entry = conv_current_entry();
+ const int who = conv_whos_talking();
+ const int node = conv_current_node();
+ const int entry = conv_current_entry();
const char *sound = conv_sound_to_play();
if (_G(kernel).trigger == 1) {
@@ -1305,7 +1306,7 @@ bool Room305::walkToObject() {
}
int Room305::getXAreaNum() const {
- int x = _G(player).click_x;
+ const int x = _G(player).click_x;
if (x < 300)
return 1;
Commit: 7c733c3d55450c9285956f5ed3860dc210227eb5
https://github.com/scummvm/scummvm/commit/7c733c3d55450c9285956f5ed3860dc210227eb5
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-16T22:33:11+01:00
Commit Message:
M4: RIDDLE: Remove (and document) logically dead code (CID 1562470 ), remove duplicate case in switch, fix some const and boolean usages 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 bb9dd374c67..1323ff2ad95 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -218,7 +218,7 @@ void Room603::init() {
_door = series_show("603DOOR", 0xf00, 16, -1, -1, 23, 100, 0, 0);
_ttDigShirtOff = series_load("TT DIG LOOP NO SHIRT");
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, false,
triggerMachineByHashCallback, "tt");
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 2, 2, 200, _ttDigShirtOff, 2, 2, 0);
@@ -246,7 +246,7 @@ void Room603::init() {
hotspot_set_active("person in pit", false);
if (_val5) {
- _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");
sendWSMessage_10000(1, _tt, _ttD01, 1, 1, 400, _ttD01, 1, 1, 0);
_trigger1 = 400;
@@ -254,7 +254,7 @@ void Room603::init() {
_ttShadow = series_show("tt walker shadow 4", 0xf00, 0, -1, -1, 0, 53, 291, 293);
} else {
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xf00, false,
triggerMachineByHashCallback, "tt");
sendWSMessage_10000(1, _tt, _ttDigShirtOn, 1, 1, 500,
_ttDigShirtOn, 1, 1, 0);
@@ -427,11 +427,6 @@ void Room603::daemon() {
break;
case 5:
- sendWSMessage_10000(1, _tt, _ttDigShirtOff, 14, 1, 200,
- _ttDigShirtOff, 2, 2, 0);
- _ttMode = 1;
- break;
-
case 22:
sendWSMessage_10000(1, _tt, _ttDigShirtOff, 14, 1, 200,
_ttDigShirtOff, 2, 2, 0);
@@ -781,7 +776,7 @@ void Room603::daemon() {
case 320:
terminateMachineAndNull(_ripley);
_ttNote = series_show("603rp02a", 0x100, 16);
- _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");
sendWSMessage_10000(1, _tt, _tt03, 1, 39, 322, _tt03, 39, 39, 0);
break;
@@ -807,7 +802,7 @@ void Room603::daemon() {
case 326:
terminateMachineAndNull(_tt);
- _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");
sendWSMessage_10000(1, _tt, _ttD01, 1, 1, 400, _ttD01, 1, 1, 0);
_ttShould = 6;
@@ -1260,8 +1255,8 @@ void Room603::pre_parser() {
}
void Room603::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("conv603a")) {
conv603a();
@@ -1315,7 +1310,7 @@ void Room603::parser() {
case 2:
sendWSMessage_150000(-1);
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 311, 308, -59, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 311, 308, -59, 0x100, false,
triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
sendWSMessage_10000(1, _ripley, _rp01, 1, 15, 302, _rp01, 15, 15, 0);
@@ -1578,9 +1573,9 @@ void Room603::parser() {
void Room603::conv603a() {
const char *sound = conv_sound_to_play();
- int who = conv_whos_talking();
- int node = conv_current_node();
- int entry = conv_current_entry();
+ const int who = conv_whos_talking();
+ const int node = conv_current_node();
+ const int entry = conv_current_entry();
switch (_G(kernel).trigger) {
case 1:
@@ -1832,8 +1827,9 @@ void Room603::conv603a() {
_ripleyShould = 10;
} else if (node == 25 && entry == 2) {
_ripleyShould = 7;
- } else if ((node == 12 && entry == 1) ||
- (node == 7 && entry == 0)) {
+ } else if (node == 12 && entry == 1) {
+ // The original is also testing the following: (node == 7 && entry == 0)
+ // This is logically dead code, as (node == 7) is already checked earlier in the if cascade
_ripleyShould = 6;
} else if (node == 5 && entry == 0) {
_ripleyShould = 10;
@@ -1853,9 +1849,9 @@ void Room603::conv603a() {
void Room603::conv603b() {
const char *sound = conv_sound_to_play();
- int who = conv_whos_talking();
- int node = conv_current_node();
- int entry = conv_current_entry();
+ const int who = conv_whos_talking();
+ const int node = conv_current_node();
+ const int entry = conv_current_entry();
if (_G(kernel).trigger == 1) {
if (node != 13 && node != 16) {
@@ -2217,7 +2213,7 @@ void Room603::playRandomDigi(int max) {
static const char *SOUNDS[4] = {
"603_s02", "603_s02a", "603_s02b", "603_s02c"
};
- int num = imath_ranged_rand(1, max) - 1;
+ const int num = imath_ranged_rand(1, max) - 1;
if (num < 4)
digi_play(SOUNDS[num], 2);
}
More information about the Scummvm-git-logs
mailing list