[Scummvm-git-logs] scummvm master -> 927b4c65a4d84b74cfb14e63a7ad933df6d02c5f
dreammaster
noreply at scummvm.org
Fri Apr 24 11:27:13 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
927b4c65a4 MADS: PHANTOM: If parenthesis clarifiactions
Commit: 927b4c65a4d84b74cfb14e63a7ad933df6d02c5f
https://github.com/scummvm/scummvm/commit/927b4c65a4d84b74cfb14e63a7ad933df6d02c5f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-04-24T21:27:00+10:00
Commit Message:
MADS: PHANTOM: If parenthesis clarifiactions
Changed paths:
engines/mads/madsv2/phantom/rooms/room110.cpp
engines/mads/madsv2/phantom/rooms/room205.cpp
diff --git a/engines/mads/madsv2/phantom/rooms/room110.cpp b/engines/mads/madsv2/phantom/rooms/room110.cpp
index b59ad83afa3..71e18ba5b97 100644
--- a/engines/mads/madsv2/phantom/rooms/room110.cpp
+++ b/engines/mads/madsv2/phantom/rooms/room110.cpp
@@ -177,8 +177,8 @@ void room_110_parser() {
if (player_said_2(walk_through, right_door) || player_said_2(open, right_door) ||
player_said_2(unlock, right_door) || player_said_2(lock, right_door)) {
- if ((global[current_year] == 1881) || (global[done_brie_conv_203] >= YES) &&
- !player_said_2(unlock, right_door) && !player_said_2(lock, right_door)) {
+ if (((global[current_year] == 1881) || (global[done_brie_conv_203] >= YES)) &&
+ !player_said_2(unlock, right_door) && !player_said_2(lock, right_door)) {
switch (kernel.trigger) {
case 0:
player.commands_allowed = false;
diff --git a/engines/mads/madsv2/phantom/rooms/room205.cpp b/engines/mads/madsv2/phantom/rooms/room205.cpp
index 01c2f6df04c..9a19316afec 100644
--- a/engines/mads/madsv2/phantom/rooms/room205.cpp
+++ b/engines/mads/madsv2/phantom/rooms/room205.cpp
@@ -1232,12 +1232,12 @@ void room_205_parser() {
}
if ((player_said_1(enter)) || (player_said_1(open)) || player_said_1(unlock) || player_said_1(lock)) {
- if (((player_said_1(box_five)) && ((global[doors_in_205] == BOTH_LOCKED) || (global[doors_in_205] == RIGHT_OPEN))
- || player_said_1(unlock) || player_said_1(lock))
- ||
- ((player_said_1(box_nine)) && ((global[doors_in_205] == BOTH_LOCKED) || (global[doors_in_205] == LEFT_OPEN)))
- ||
- (player_said_1(box_six)) || (player_said_1(box_seven)) || (player_said_1(box_eight))) {
+ if ((((player_said_1(box_five)) && ((global[doors_in_205] == BOTH_LOCKED) || (global[doors_in_205] == RIGHT_OPEN)))
+ || player_said_1(unlock) || player_said_1(lock))
+ ||
+ (((player_said_1(box_nine)) && ((global[doors_in_205] == BOTH_LOCKED) || (global[doors_in_205] == LEFT_OPEN)))
+ ||
+ (player_said_1(box_six)) || (player_said_1(box_seven)) || (player_said_1(box_eight)))) {
switch (kernel.trigger) {
case 0:
player.commands_allowed = false;
More information about the Scummvm-git-logs
mailing list