[Scummvm-git-logs] scummvm master -> e0f2222c7649baeece5f9f16e911cd4757a05cac
Strangerke
noreply at scummvm.org
Wed Dec 11 06:54:49 UTC 2024
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:
6436040f16 M4: RIDDLE: Room 801: Fix bug + fix CID 1563767 + renaming and cleanup
efa8495c36 M4: RIDDLE: Room 801: Add syncGame
e0f2222c76 M4: RIDDLE: Room 510: Remove some dead code (CID 1561184), constify some variables
Commit: 6436040f16e0fbd44ea2e9329541aa60523f0f17
https://github.com/scummvm/scummvm/commit/6436040f16e0fbd44ea2e9329541aa60523f0f17
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-11T07:54:27+01:00
Commit Message:
M4: RIDDLE: Room 801: Fix bug + fix CID 1563767 + renaming and cleanup
Changed paths:
engines/m4/riddle/rooms/section8/room801.cpp
engines/m4/riddle/rooms/section8/room801.h
diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index f4ed5d1df3c..1c72a6aba0f 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -88,7 +88,7 @@ void Room801::init() {
_G(flags)[V251] = 0;
_G(flags)[V252] = 0;
_G(flags)[V273] = 0;
- _unkVal1 = 0;
+ _cellarDoorOpened = false;
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
@@ -111,7 +111,7 @@ void Room801::init() {
20, 310, 3, triggerMachineByHashCallback3000, "mc_trek");
kernel_timing_trigger(60, 1, nullptr);
} else if (_G(game).previous_room == KERNEL_RESTORING_GAME) {
- if (_unkVal1) {
+ if (_cellarDoorOpened) {
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", true);
@@ -132,7 +132,7 @@ void Room801::init() {
ws_demand_facing(_G(my_walker), 8);
ws_demand_location(_G(my_walker), 525, 301);
_ripReturnsFromRootCellarSeries = series_load("rip returns from root cellar", -1, nullptr);
- _unkVal1 = 1;
+ _cellarDoorOpened = true;
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", true);
@@ -143,17 +143,16 @@ void Room801::init() {
}
void Room801::pre_parser() {
- player_said("take");
- bool lookCheck = (player_said("look") || player_said("look at"));
+ const bool lookFl = player_said_any("look", "look at");
- if (lookCheck && player_said("farm")) {
+ if (lookFl && player_said("farm")) {
digi_play("801R23", 1, 255, -1, -1);
_G(player).need_to_walk = false;
_G(player).ready_to_walk = true;
_G(player).waiting_for_walk = false;
}
- if (lookCheck && player_said(" ")) {
+ if (lookFl && player_said(" ")) {
_G(player).need_to_walk = false;
_G(player).ready_to_walk = true;
_G(player).waiting_for_walk = false;
@@ -161,35 +160,14 @@ void Room801::pre_parser() {
}
void Room801::parser() {
- bool lookFl = false;
- bool takeFl = false;
- bool gearFl = false;
- bool talkFl = false;
- bool goFl = false;
-
- if (player_said("look") || player_said("look at")) {
- lookFl = true;
- }
-
- if (player_said("talk") || player_said("talk TO")) {
- talkFl = true;
- }
-
- if (player_said("take")) {
- takeFl = true;
- }
+ const bool lookFl = player_said_any("look", "look at");
+ const bool takeFl = player_said_any("talk", "talk to");
+ const bool gearFl = player_said("gear");
+ const bool talkFl = player_said("take");
+ const bool goFl = player_said("go");
- if (player_said("gear")) {
- gearFl = true;
- }
-
- if (player_said("go")) {
- goFl = true;
- }
-
- if (player_said("conv801a")) {
+ if (player_said("conv801a"))
room801_conv801a();
- }
else if (_G(kernel).trigger == 747) {
_unkVal2 = 4;
@@ -200,7 +178,7 @@ void Room801::parser() {
} // if (_G(kernel).trigger == 747)
else if (lookFl && _G(walker).ripley_said(SAID)) {
- // Nothing (though it may be important to keep it because of the cascade of checks
+ // Nothing, though it's important to keep it because of the digi_play call in ripley_said (+ the cascade of checks)
}
else if (lookFl && player_said("house")) {
@@ -1135,11 +1113,11 @@ void Room801::daemon() {
}
void Room801::room801_conv801a() {
- int32 entry = conv_current_entry();
- int32 node = conv_current_node();
+ const int32 entry = conv_current_entry();
+ const int32 node = conv_current_node();
if (_G(kernel).trigger == 1) {
- int32 who = conv_whos_talking();
+ const int32 who = conv_whos_talking();
if (who <= 0) {
_unkVal3 = 1;
_ripOpensCellarSeries = 1;
@@ -1164,7 +1142,7 @@ void Room801::room801_conv801a() {
return;
}
- int32 who = conv_whos_talking();
+ const int32 who = conv_whos_talking();
if (who <= 0) {
if ((node == 1 && entry == 0) || (node == 1 && entry == 1) || (node == 1 && entry == 2) || (node == 4 && entry == 2))
_unkVal3 = 3;
diff --git a/engines/m4/riddle/rooms/section8/room801.h b/engines/m4/riddle/rooms/section8/room801.h
index f15c35353f7..8d62fc7f8ef 100644
--- a/engines/m4/riddle/rooms/section8/room801.h
+++ b/engines/m4/riddle/rooms/section8/room801.h
@@ -70,7 +70,6 @@ private:
int32 _shovelSeries = 0;
int32 _counter = 0;
- int32 _unkVal1 = 0;
int32 _unkVal2 = 0;
int32 _unkVal3 = 0;
int32 _unkVal5 = 0;
@@ -80,6 +79,7 @@ private:
bool _unkFlag1 = false;
bool _unkFlag2 = false;
bool _cellarOpenFl = false;
+ bool _cellarDoorOpened = false;
machine *_cellarDoorClosedMach = nullptr;
machine *_cellarDoorOpenMach = nullptr;
Commit: efa8495c361f81690667a0c7d1b8c98c28c26455
https://github.com/scummvm/scummvm/commit/efa8495c361f81690667a0c7d1b8c98c28c26455
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-11T07:54:27+01:00
Commit Message:
M4: RIDDLE: Room 801: Add syncGame
Changed paths:
engines/m4/riddle/rooms/section8/room801.cpp
engines/m4/riddle/rooms/section8/room801.h
diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index 1c72a6aba0f..bcaf78b4581 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -88,7 +88,7 @@ void Room801::init() {
_G(flags)[V251] = 0;
_G(flags)[V252] = 0;
_G(flags)[V273] = 0;
- _cellarDoorOpened = false;
+ _cellarDoorOpened = 0;
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
@@ -132,7 +132,7 @@ void Room801::init() {
ws_demand_facing(_G(my_walker), 8);
ws_demand_location(_G(my_walker), 525, 301);
_ripReturnsFromRootCellarSeries = series_load("rip returns from root cellar", -1, nullptr);
- _cellarDoorOpened = true;
+ _cellarDoorOpened = 1;
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", true);
hotspot_set_active(_G(currentSceneDef).hotspots, "root cellar ", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "ROOT CELLAR", true);
@@ -1112,6 +1112,10 @@ void Room801::daemon() {
}
}
+void Room801::syncGame(Common::Serializer &s) {
+ s.syncAsSint32LE(_cellarDoorOpened);
+}
+
void Room801::room801_conv801a() {
const int32 entry = conv_current_entry();
const int32 node = conv_current_node();
diff --git a/engines/m4/riddle/rooms/section8/room801.h b/engines/m4/riddle/rooms/section8/room801.h
index 8d62fc7f8ef..3ec2486f43a 100644
--- a/engines/m4/riddle/rooms/section8/room801.h
+++ b/engines/m4/riddle/rooms/section8/room801.h
@@ -38,6 +38,7 @@ public:
void pre_parser() override;
void parser() override;
void daemon() override;
+ void syncGame(Common::Serializer &s) override;
private:
void room801_conv801a();
@@ -69,6 +70,7 @@ private:
int32 _rptmr15Series = 0;
int32 _shovelSeries = 0;
+ int32 _cellarDoorOpened = 0;
int32 _counter = 0;
int32 _unkVal2 = 0;
int32 _unkVal3 = 0;
@@ -79,7 +81,6 @@ private:
bool _unkFlag1 = false;
bool _unkFlag2 = false;
bool _cellarOpenFl = false;
- bool _cellarDoorOpened = false;
machine *_cellarDoorClosedMach = nullptr;
machine *_cellarDoorOpenMach = nullptr;
Commit: e0f2222c7649baeece5f9f16e911cd4757a05cac
https://github.com/scummvm/scummvm/commit/e0f2222c7649baeece5f9f16e911cd4757a05cac
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-11T07:54:27+01:00
Commit Message:
M4: RIDDLE: Room 510: Remove some dead code (CID 1561184), constify some variables
Changed paths:
engines/m4/riddle/rooms/section5/room510.cpp
diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 44073eb4422..42935d0f8f9 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -163,9 +163,9 @@ void Room510::daemon() {
}
void Room510::pre_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 (!useFlag && !lookFlag && !takeFlag)
return;
@@ -193,8 +193,6 @@ void Room510::pre_parser() {
return;
if (lookFlag && player_said("SKULL"))
return;
- if (!lookFlag && !takeFlag && !useFlag)
- return;
if (player_said_any("ALTAR POST", "ALTAR POST ", "TROUGH", "STAIRS")) {
switch (imath_ranged_rand(1, 5)) {
@@ -224,9 +222,9 @@ void Room510::pre_parser() {
#define HAS(ITEM) (player_said(ITEM) && inv_player_has(ITEM))
void Room510::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 (lookFlag && player_said(" ")) {
digi_play("510R02", 1);
More information about the Scummvm-git-logs
mailing list