[Scummvm-git-logs] scummvm master -> 7d748ce0b48eefb1b7a30619597c54e643c63586
Strangerke
noreply at scummvm.org
Sat Feb 22 11:02:36 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:
df518f085f M4: RIDDLE: Room 303: Fix Feng multiple hotspots being active at the same time
ba76af58b1 M4: RIDDLE: Room 304: Add some missing const, some small cleanup
7d748ce0b4 M4: RIDDLE: Room 304: Fix a bug related to the cartoon popup
Commit: df518f085ff77a59fe2a4ff67e658693772b12bc
https://github.com/scummvm/scummvm/commit/df518f085ff77a59fe2a4ff67e658693772b12bc
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-22T12:02:06+01:00
Commit Message:
M4: RIDDLE: Room 303: Fix Feng multiple hotspots being active at the same time
Changed paths:
engines/m4/riddle/rooms/section3/room303.cpp
diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 0a8cdf52a61..d99dbfc02fb 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -1778,7 +1778,6 @@ void Room303::setFengActive(bool flag) {
} else {
hotspot->active = hotspot->lr_x > 600;
}
- break;
}
}
}
@@ -1875,6 +1874,7 @@ void Room303::conv303a() {
}
}
+// Conversation with Mei
void Room303::conv303b() {
const int who = conv_whos_talking();
const int node = conv_current_node();
Commit: ba76af58b1887e0feccac558d68def680626baf0
https://github.com/scummvm/scummvm/commit/ba76af58b1887e0feccac558d68def680626baf0
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-22T12:02:07+01:00
Commit Message:
M4: RIDDLE: Room 304: Add some missing const, some small cleanup
Changed paths:
engines/m4/riddle/rooms/section3/room304.cpp
diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 273cf027e9d..816dacd11ef 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -122,7 +122,7 @@ void Room304::init() {
_G(globals)[GLB_TEMP_1] = _smoke << 24;
_G(globals)[GLB_TEMP_2] = 0x10000;
- _machine2 = TriggerMachineByHash(45, nullptr, -1, -1, intrMsg, 0, "MACHINE fl snake rock");
+ _machine2 = TriggerMachineByHash(45, nullptr, -1, -1, intrMsg, false, "MACHINE fl snake rock");
}
_sword = series_show_sprite("one frame sword", 0, 0xa00);
@@ -166,8 +166,8 @@ void Room304::daemon() {
}
void Room304::pre_parser() {
- bool takeFlag = player_said("take");
- bool useFlag = player_said("gear");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said("gear");
if (_flag1) {
terminateMachineAndNull(_machine3);
@@ -202,9 +202,9 @@ void Room304::pre_parser() {
}
void Room304::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("cartoon")) {
if (_G(flags)[V001]) {
@@ -412,7 +412,7 @@ void Room304::parser() {
void Room304::intrMsg(frac16 myMessage, struct machine *sender) {
Room304 *r = static_cast<Room304 *>(g_engine->_activeRoom);
- auto oldMode = _G(kernel).trigger_mode;
+ const KernelTriggerType oldMode = _G(kernel).trigger_mode;
if ((myMessage >> 16) == 57) {
if ((_G(globals)[GLB_TEMP_1] >> 16) == 1) {
Commit: 7d748ce0b48eefb1b7a30619597c54e643c63586
https://github.com/scummvm/scummvm/commit/7d748ce0b48eefb1b7a30619597c54e643c63586
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-22T12:02:07+01:00
Commit Message:
M4: RIDDLE: Room 304: Fix a bug related to the cartoon popup
Changed paths:
engines/m4/adv_r/adv_file.cpp
engines/m4/burger/gui/inventory.cpp
engines/m4/riddle/rooms/section3/room304.cpp
engines/m4/riddle/rooms/section3/room304.h
diff --git a/engines/m4/adv_r/adv_file.cpp b/engines/m4/adv_r/adv_file.cpp
index 523eb15a1cb..70c46568116 100644
--- a/engines/m4/adv_r/adv_file.cpp
+++ b/engines/m4/adv_r/adv_file.cpp
@@ -187,8 +187,8 @@ bool kernel_load_room(int minPalEntry, int maxPalEntry, SceneDef *rdef, GrBuff *
}
bool kernel_load_variant(const char *variant) {
- auto &sceneDef = _G(currentSceneDef);
- auto *codeBuff = _G(screenCodeBuff);
+ SceneDef &sceneDef = _G(currentSceneDef);
+ GrBuff *codeBuff = _G(screenCodeBuff);
Common::String filename;
if (!codeBuff)
diff --git a/engines/m4/burger/gui/inventory.cpp b/engines/m4/burger/gui/inventory.cpp
index 305ae8f1ef9..e8facf6b087 100644
--- a/engines/m4/burger/gui/inventory.cpp
+++ b/engines/m4/burger/gui/inventory.cpp
@@ -78,7 +78,7 @@ bool Inventory::add(const Common::String &name, const Common::String &verb, int3
for (int i = _num_cells; i > 0; --i)
_items[i] = _items[i - 1];
- auto &item = _items[0];
+ Entry &item = _items[0];
item._name = name;
item._verb = verb;
item._cell = invSprite;
diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 816dacd11ef..0b3f237c563 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -47,7 +47,7 @@ void Room304::init() {
_val1 = 0;
if (_G(game).previous_room != KERNEL_RESTORING_GAME)
- _flag1 = false;
+ _closeCartoonFl = false;
if (_G(game).previous_room == 303 && _G(flags)[V001])
_G(game).previous_room = 354;
@@ -169,9 +169,9 @@ void Room304::pre_parser() {
const bool takeFlag = player_said("take");
const bool useFlag = player_said("gear");
- if (_flag1) {
- terminateMachineAndNull(_machine3);
- _flag1 = false;
+ if (_closeCartoonFl) {
+ terminateMachineAndNull(_cartoonMach);
+ _closeCartoonFl = false;
intr_cancel_sentence();
hotspot_restore_all();
interface_show();
@@ -216,8 +216,8 @@ void Room304::parser() {
intr_cancel_sentence();
hotspot_add_dynamic("x", " ", 0, 0, 1500, 374, 0);
- _flag1 = true;
- _pu = series_show_sprite(_G(flags)[V000] ? "394pu99" : "304pu99", 0, 0);
+ _closeCartoonFl = true;
+ _cartoonMach = series_show_sprite(_G(flags)[V000] ? "394pu99" : "304pu99", 0, 0);
digi_play("304r59", 1);
}
} else if (_G(kernel).trigger == 749) {
diff --git a/engines/m4/riddle/rooms/section3/room304.h b/engines/m4/riddle/rooms/section3/room304.h
index 429e12e47ac..4494896b75b 100644
--- a/engines/m4/riddle/rooms/section3/room304.h
+++ b/engines/m4/riddle/rooms/section3/room304.h
@@ -30,7 +30,7 @@ namespace Rooms {
class Room304 : public Room {
private:
- bool _flag1 = false;
+ bool _closeCartoonFl = false;
int _val1 = 0;
bool _useSword = false;
bool _useHandlingStick = false;
@@ -41,8 +41,7 @@ private:
int _smoke = -1;
machine *_mei = nullptr;
machine *_machine2 = nullptr;
- machine *_machine3 = nullptr;
- machine *_pu = nullptr;
+ machine *_cartoonMach = nullptr;
machine *_cobraKills = nullptr;
machine *_field60 = nullptr;
int _cutSnake = -1;
More information about the Scummvm-git-logs
mailing list