[Scummvm-git-logs] scummvm master -> 7c76464420a4e650717ea5d2ce92e1493e2a3b0e
Strangerke
noreply at scummvm.org
Thu Mar 13 22:11:27 UTC 2025
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9768784568 M4: RIDDLE: Remove extra break in room 607
cf23a976b0 M4: RIDDLE: Some cleanup in room 608
8599ed5175 M4: Fix signature of conv_reset
7c76464420 M4: RIDDLE: Some cleanup in room 604, 605, 610
Commit: 976878456858f3444f24308699763ddb9ee54292
https://github.com/scummvm/scummvm/commit/976878456858f3444f24308699763ddb9ee54292
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-13T23:11:02+01:00
Commit Message:
M4: RIDDLE: Remove extra break 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 cccea764313..83990f647b0 100644
--- a/engines/m4/riddle/rooms/section6/room607.cpp
+++ b/engines/m4/riddle/rooms/section6/room607.cpp
@@ -265,7 +265,6 @@ void Room607::parser() {
digi_play("607_s02", 2);
break;
- break;
default:
break;
}
Commit: cf23a976b0fd70042b10ea65aef73a0019d0daf0
https://github.com/scummvm/scummvm/commit/cf23a976b0fd70042b10ea65aef73a0019d0daf0
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-13T23:11:02+01:00
Commit Message:
M4: RIDDLE: Some cleanup in room 608
Changed paths:
engines/m4/riddle/rooms/section6/room608.cpp
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index f13c74cf16a..5da21a6bc2f 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -56,7 +56,7 @@ void Room608::init() {
ws_walk_load_walker_series(NORMAL_DIRS1, NORMAL_NAMES1);
ws_walk_load_shadow_series(SHADOW_DIRS1, SHADOW_NAMES1);
- _ol = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, 0,
+ _ol = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, false,
triggerMachineByHashCallback, "ol");
sendWSMessage_10000(1, _ol, _old1, 1, 1, 200, _old1, 1, 1, 0);
_ctr1 = 0;
@@ -213,7 +213,7 @@ void Room608::daemon() {
_shadow = series_show("safari shadow 3", 0xf00, 0, -1, -1, 0,
_G(player_info).scale, _G(player_info).x, _G(player_info).y);
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip talker");
sendWSMessage_10000(1, _ripley, _rp01, 1, 13, -1, _rp01, 20, 20, 0);
break;
@@ -224,7 +224,7 @@ void Room608::daemon() {
_ttShadow = series_show("tt walker shadow 5", 0xf00, 0, -1, -1, 0,
_G(player_info).scale, _G(player_info).x, _G(player_info).y);
- _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "tt talker");
sendWSMessage_10000(1, _ttTalker, _tt01, 63, 54, 22, _tt01, 54, 54, 0);
break;
@@ -694,7 +694,7 @@ void Room608::daemon() {
sendWSMessage_10000(1, _ol, _old1, 1, 1, 200, _old1, 1, 1, 0);
_oldMode = 0;
_oldShould = 1;
- _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip talker");
sendWSMessage_10000(1, _ol2, _old5f, 1, 1, -1, _old5f, 1, 4, 1);
sendWSMessage_1a0000(_ol2, 11);
@@ -740,7 +740,7 @@ void Room608::daemon() {
sendWSMessage_10000(1, _ol, _old1, 1, 1, 200, _old1, 1, 1, 0);
_oldMode = 0;
_oldShould = 1;
- _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip talker");
sendWSMessage_10000(1, _ol2, _old5f, 1, 1, -1, _old5f, 1, 4, 1);
sendWSMessage_1a0000(_ol2, 11);
@@ -1011,7 +1011,7 @@ void Room608::daemon() {
ws_demand_location(_G(my_walker), 494, 276, 3);
sendWSMessage_10000(_G(my_walker), 524, 296, 9, 532, 1);
- _ol = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, 0,
+ _ol = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x200, false,
triggerMachineByHashCallback, "ol");
sendWSMessage_10000(1, _ol, _old8, 1, 1, -1, _old8, 1, 1, 1);
break;
@@ -1132,7 +1132,7 @@ void Room608::daemon() {
ws_hide_walker(_tt);
_ttShadow = series_show("tt walker shadow 3", 0xf00, 0, -1, -1, 0,
_G(player_info).scale, _G(player_info).x, _G(player_info).y);
- _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "tt walker");
sendWSMessage_10000(1, _ttTalker, _tt02, 1, 11, 703, _tt02, 11, 11, 0);
break;
@@ -1201,7 +1201,7 @@ void Room608::daemon() {
series_unload(203);
series_unload(204);
- _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xd00, 0,
+ _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xd00, false,
triggerMachineByHashCallback, "tt walker");
sendWSMessage_10000(1, _ttTalker, _tt03, 1, 60, -1, _tt03, 60, 60, 0);
digi_play("608t06", 1, 255, 726);
@@ -1299,7 +1299,7 @@ void Room608::daemon() {
series_load(TT_NORMAL_NAMES[4], TT_NORMAL_DIRS[4]);
ws_hide_walker(_tt);
- _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "tt walker");
sendWSMessage_10000(1, _ttTalker, _all5a, 1, 1, -1, _all5a, 1, 6, 4);
digi_play("608r58", 2, 255, 752);
@@ -1342,11 +1342,11 @@ void Room608::daemon() {
case 766:
terminateMachineAndNull(_ttTalker);
- _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ttTalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "tt talker");
sendWSMessage_10000(1, _ttTalker, _loop0, 1, 1, -1, _loop0, 1, 6, 4);
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip talker");
sendWSMessage_10000(1, _ripley, _loop1, 1, 1, -1, _loop1, 1, 1, 0);
digi_play("608t11a", 2, 255, 767);
@@ -1446,8 +1446,8 @@ void Room608::daemon() {
}
void Room608::pre_parser() {
- bool takeFlag = player_said("take");
- bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (player_said("HORN/PULL CORD", "WATER") && !_G(flags)[V009])
_G(player).resetWalk();
@@ -1462,10 +1462,10 @@ void Room608::pre_parser() {
}
void Room608::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool talkFlag = player_said_any("talk", "talk to");
- 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 talkFlag = player_said_any("talk", "talk to");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (player_said("conv608a")) {
conv608a();
@@ -1484,7 +1484,7 @@ void Room608::parser() {
_shadow = series_show("safari shadow 3", 0xf00, 0, -1, -1, 0,
_G(player_info).scale, _G(player_info).x, _G(player_info).y);
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
@@ -1533,7 +1533,7 @@ void Room608::parser() {
16, -1, -1, 0, _G(player_info).scale,
_G(player_info).x, _G(player_info).y);
_horn = series_load("608rp03");
- _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "ol");
sendWSMessage_10000(1, _ol2, _horn, 1, 24, 2, _horn, 24, 24, 0);
break;
@@ -1573,7 +1573,7 @@ void Room608::parser() {
16, -1, -1, 0, _G(player_info).scale,
_G(player_info).x, _G(player_info).y);
_horn = series_load("608rp03");
- _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "ol");
sendWSMessage_10000(1, _ol2, _horn, 39, 1, 2, _horn, 1, 1, 0);
break;
@@ -1600,7 +1600,7 @@ void Room608::parser() {
_G(player_info).scale, _G(player_info).x, _G(player_info).y);
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
@@ -1654,7 +1654,7 @@ void Room608::parser() {
_G(player_info).scale, _G(player_info).x, _G(player_info).y);
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
@@ -1790,9 +1790,9 @@ void Room608::parser() {
void Room608::conv608a() {
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 (who <= 0) {
@@ -2023,7 +2023,7 @@ bool Room608::hornCordWater() {
_shadow5 = series_show("safari shadow 5", _G(player_info).depth, 144, -1, -1, 0,
_G(player_info).scale, _G(player_info).x, _G(player_info.y));
_horn = series_load("608horn");
- _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "ol");
sendWSMessage_10000(1, _ol2, _horn, 1, 16, 2, _horn, 16, 16, 0);
return true;
Commit: 8599ed51757ced0a7362c82032b117840be8345b
https://github.com/scummvm/scummvm/commit/8599ed51757ced0a7362c82032b117840be8345b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-13T23:11:02+01:00
Commit Message:
M4: Fix signature of conv_reset
Changed paths:
engines/m4/adv_r/conv_io.cpp
engines/m4/adv_r/conv_io.h
diff --git a/engines/m4/adv_r/conv_io.cpp b/engines/m4/adv_r/conv_io.cpp
index d42381328d2..e666e233361 100644
--- a/engines/m4/adv_r/conv_io.cpp
+++ b/engines/m4/adv_r/conv_io.cpp
@@ -663,7 +663,8 @@ static Conv *conv_restore_state(Conv *c) {
conv_unload(c);
c = nullptr;
- } else c->exit_now = CONV_OK;
+ } else
+ c->exit_now = CONV_OK;
i_am_so_done:
if (conv_save_buff)
diff --git a/engines/m4/adv_r/conv_io.h b/engines/m4/adv_r/conv_io.h
index 8310cc25f5e..3f2c86967e4 100644
--- a/engines/m4/adv_r/conv_io.h
+++ b/engines/m4/adv_r/conv_io.h
@@ -102,7 +102,7 @@ void conv_set_handle(Conv *c);
void conv_resume(Conv *c);
void conv_resume();
-void conv_reset(char *filename);
+void conv_reset(const char *filename);
void conv_reset_all();
void conv_play(Conv *c);
Commit: 7c76464420a4e650717ea5d2ce92e1493e2a3b0e
https://github.com/scummvm/scummvm/commit/7c76464420a4e650717ea5d2ce92e1493e2a3b0e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-13T23:11:02+01:00
Commit Message:
M4: RIDDLE: Some cleanup in room 604, 605, 610
Changed paths:
engines/m4/riddle/rooms/section6/room604.cpp
engines/m4/riddle/rooms/section6/room605.cpp
engines/m4/riddle/rooms/section6/room610.cpp
diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index 4cca7d36dcd..59434d5403b 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -216,8 +216,8 @@ void Room604::daemon() {
}
void Room604::pre_parser() {
- bool takeFlag = player_said("take");
- bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+ const bool takeFlag = player_said("take");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (player_said("PULL CORD", "generator set"))
_G(player).resetWalk();
@@ -248,9 +248,9 @@ void Room604::pre_parser() {
}
void Room604::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("WHALE BONE HORN") && useWhaleBoneHorn()) {
// No implementation
diff --git a/engines/m4/riddle/rooms/section6/room605.cpp b/engines/m4/riddle/rooms/section6/room605.cpp
index f67868d8259..9413e3e5fb9 100644
--- a/engines/m4/riddle/rooms/section6/room605.cpp
+++ b/engines/m4/riddle/rooms/section6/room605.cpp
@@ -64,7 +64,7 @@ void Room605::init() {
_G(player).disable_hyperwalk = true;
ws_walk_load_walker_series(TT_NORMAL_DIRS, TT_NORMAL_NAMES);
ws_walk_load_shadow_series(TT_SHADOW_DIRS, TT_SHADOW_NAMES);
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, false,
triggerMachineByHashCallback, "tt");
sendWSMessage_10000(1, _tt, _605tt, 1, 1, 200, _605tt, 1, 1, 0);
_ttShadow = series_show("tt walker shadow 5", 0x701, 16, -1, -1, 0, 68, 476, 290);
@@ -126,7 +126,7 @@ void Room605::daemon() {
case 10:
sendWSMessage_60000(_tt);
- _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, 0,
+ _tt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x700, false,
triggerMachineByHashCallback, "tt");
sendWSMessage_10000(1, _tt, _605tt, 222, 234, 11, _605tt, 1, 1, 0);
_ttShadow = series_show("tt walker shadow 5", 0x701, 16, -1,
@@ -433,9 +433,9 @@ void Room605::pre_parser() {
}
void Room605::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool talkFlag = player_said_any("talk", "talk to");
- bool takeFlag = player_said("take");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool talkFlag = player_said_any("talk", "talk to");
+ const bool takeFlag = player_said("take");
if (player_said("conv605a")) {
conv605a();
@@ -445,7 +445,7 @@ void Room605::parser() {
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
_G(player_info).x, _G(player_info).y, _G(player_info).scale + 1,
- 0x100, 1, triggerMachineByHashCallback, "rip");
+ 0x100, true, triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
sendWSMessage_10000(1, _ripley, 1, 1, 1, 300, 1, 1, 1, 0);
@@ -475,7 +475,7 @@ void Room605::parser() {
} else {
if (_G(kernel).trigger == 6)
_G(flags)[V196] = 1;
- sketchInJournal(0);
+ sketchInJournal(nullptr);
}
} else if (lookFlag && player_said("head")) {
digi_play("605r03", 1);
@@ -539,9 +539,9 @@ void Room605::parser() {
void Room605::conv605a() {
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:
@@ -579,7 +579,7 @@ void Room605::conv605a() {
ws_hide_walker();
_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
_G(player_info).x, _G(player_info).y, _G(player_info).scale + 1,
- 0x100, 1, triggerMachineByHashCallback, "rip");
+ 0x100, true, triggerMachineByHashCallback, "rip");
_G(kernel).trigger_mode = KT_DAEMON;
sendWSMessage_10000(1, _ripley, 1, 1, 1, 300, 1, 1, 1, 0);
@@ -648,7 +648,7 @@ bool Room605::takePupilDisk() {
player_set_commands_allowed(false);
_ripHandOnIris = series_load("RIP BURNS HAND ON IRIS");
ws_hide_walker();
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "take pupil");
sendWSMessage_10000(1, _ripley, _ripHandOnIris, 1, 26, 2,
_ripHandOnIris, 26, 26, 1);
@@ -689,7 +689,7 @@ bool Room605::sleeveDisk1() {
_ripGetsIrisWithCloth = series_load("RIP GETS IRIS WITH CLOTH");
digi_preload("605_s01");
digi_preload("605_s02");
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "take pupil");
sendWSMessage_10000(1, _ripley, _ripGetsIrisWithCloth, 1, 41, 1,
_ripGetsIrisWithCloth, 41, 41, 1);
@@ -727,7 +727,7 @@ bool Room605::sleeveDisk1() {
case 9:
_ttShould = 7;
kernel_timing_trigger(1, 200, KT_DAEMON, KT_PARSE);
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "take pupil");
sendWSMessage_10000(1, _ripley, _ripGetsIrisWithCloth, 1, 41, 10,
_ripGetsIrisWithCloth, 41, 41, 1);
@@ -754,7 +754,7 @@ bool Room605::sleeveDisk2() {
ws_hide_walker();
_ripGetsIrisWithCloth = series_load("RIP GETS IRIS WITH CLOTH");
digi_preload("605_s01");
- _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback, "take pupil");
sendWSMessage_10000(1, _ripley, _ripGetsIrisWithCloth, 1, 41, 1,
_ripGetsIrisWithCloth, 41, 41, 1);
diff --git a/engines/m4/riddle/rooms/section6/room610.cpp b/engines/m4/riddle/rooms/section6/room610.cpp
index 707928dc38e..90f6ea6dcfc 100644
--- a/engines/m4/riddle/rooms/section6/room610.cpp
+++ b/engines/m4/riddle/rooms/section6/room610.cpp
@@ -71,9 +71,9 @@ void Room610::init() {
hotspot_set_active("window ", false);
}
- _k = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xa00, 0,
+ _k = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xa00, false,
triggerMachineByHashCallback610, "k");
- _sgTt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xb00, 0,
+ _sgTt = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0xb00, false,
triggerMachineByHashCallback610, "sg and tt");
switch (_G(kernel).trigger) {
@@ -128,7 +128,7 @@ void Room610::daemon() {
switch (_G(kernel).trigger) {
case 1:
- player_set_commands_allowed(1);
+ player_set_commands_allowed(true);
break;
case 10:
@@ -137,7 +137,7 @@ void Room610::daemon() {
ws_demand_location(_G(my_walker), 272, 273, 7);
ws_hide_walker();
- _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback610, "spleen");
sendWSMessage_10000(1, _ripAction, _ripPeerAroundHut, 1, 65, -1,
_ripPeerAroundHut, 65, 65, 1);
@@ -269,7 +269,7 @@ void Room610::daemon() {
_kShould = 0;
_val5 = 1;
_val6 = 0;
- _flag2 = 1;
+ _flag2 = true;
player_set_commands_allowed(true);
kernel_timing_trigger(300, 135);
break;
@@ -410,7 +410,7 @@ void Room610::daemon() {
case 666:
ws_hide_walker();
- _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback610, "spleen");
sendWSMessage_10000(1, _ripAction, _rp04, 1, 21, -1, _rp04, 21, 11, 4);
sendWSMessage_1a0000(_ripAction, 50);
@@ -451,16 +451,16 @@ void Room610::daemon() {
}
void Room610::pre_parser() {
- bool lookFlag = player_said_any("look", "look at");
+ const bool lookFlag = player_said_any("look", "look at");
if (lookFlag && player_said_any("HUT", "PIT", "SAMANTHA", "KUANG", "SHEN GUO"))
_G(player).resetWalk();
}
void Room610::parser() {
- bool lookFlag = player_said_any("look", "look at");
- bool talkFlag = player_said_any("talk", "talk to");
- bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+ const bool lookFlag = player_said_any("look", "look at");
+ const bool talkFlag = player_said_any("talk", "talk to");
+ const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
if (talkFlag && player_said_any("KUANG", "SHEN GUO")) {
talkKuangShenGuo();
@@ -516,7 +516,7 @@ void Room610::parser() {
}
void Room610::triggerMachineByHashCallback610(frac16 myMessage, machine *sender) {
- int trigger = myMessage >> 16;
+ const int trigger = myMessage >> 16;
if (trigger >= 0)
kernel_trigger_dispatchx(myMessage);
@@ -549,7 +549,7 @@ void Room610::talkKuangShenGuo() {
case 1:
ws_hide_walker();
- _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback610, "spleen");
sendWSMessage_10000(1, _ripAction, _rp04, 1, 21, 2, _rp04, 21, 11, 4);
sendWSMessage_1a0000(_ripAction, 50);
@@ -595,7 +595,7 @@ void Room610::talkSamantha() {
case 1:
ws_hide_walker();
- _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
+ _ripAction = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, false,
triggerMachineByHashCallback610, "spleen");
sendWSMessage_10000(1, _ripAction, _rp04, 1, 21, 2, _rp04, 21, 11, 4);
sendWSMessage_1a0000(_ripAction, 50);
More information about the Scummvm-git-logs
mailing list