[Scummvm-git-logs] scummvm master -> 3c6efd65a1bb6e948583a9a9581735cfbc25ec83
dreammaster
noreply at scummvm.org
Sun Feb 11 18:27:56 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3c6efd65a1 M4: Fix free movement in test 5 junkyard
Commit: 3c6efd65a1bb6e948583a9a9581735cfbc25ec83
https://github.com/scummvm/scummvm/commit/3c6efd65a1bb6e948583a9a9581735cfbc25ec83
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-11T10:27:50-08:00
Commit Message:
M4: Fix free movement in test 5 junkyard
Changed paths:
engines/m4/burger/rooms/section4/room406.cpp
diff --git a/engines/m4/burger/rooms/section4/room406.cpp b/engines/m4/burger/rooms/section4/room406.cpp
index 05e0035ef30..913143dabb0 100644
--- a/engines/m4/burger/rooms/section4/room406.cpp
+++ b/engines/m4/burger/rooms/section4/room406.cpp
@@ -1431,7 +1431,7 @@ void Room406::pre_parser() {
}
if (_hotspot->feet_x > _hotspot->feet_y ||
- (_hotspot->feet_y == 0x7fff && _G(click_y) > tabooAreaY(_G(click_x))))
+ (_hotspot->feet_y == 0x7fff && tabooAreaY(_G(click_x)) > _G(click_y)))
player_walk_to(_hotspot->feet_x, tabooAreaY(_hotspot->feet_x) + 1);
}
}
@@ -1513,13 +1513,13 @@ void Room406::setHotspots2() {
hotspot_set_active("LOCK", false);
hotspot_set_active("CHAIN", false);
hotspot_set_active("RAZOR WIRE ", false);
- hotspot_set_active("YARD", true);
+ hotspot_set_active("YARD ", true);
} else {
hotspot_set_active("GATE", true);
hotspot_set_active("LOCK", true);
hotspot_set_active("CHAIN", true);
hotspot_set_active("RAZOR WIRE ", true);
- hotspot_set_active("YARD", false);
+ hotspot_set_active("YARD ", false);
}
}
More information about the Scummvm-git-logs
mailing list