Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bridges moving the player when the player is underwater

Browse source
This commit is contained in:
Sezz 2025-02-11 18:05:07 +11:00
parent 0bb9af9894
commit 62ce2f043d
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@ TombEngine releases are located in this repository (alongside with Tomb Editor):
## [Version 1.7.X] (link to release) - yyyy-mm-dd
### Bug fixes
* Fixed bridges moving the player when the player is underwater.
* Fixed trigger triggerer not working.
* Fixed display pickup numeric string not being interpolated in high framerate mode.
* Fixed two block platform room portal traversal failing in some cases.

3
TombEngine/Game/collision/collide_item.cpp
View file

@ -892,7 +892,8 @@ void CollideBridgeItems(ItemInfo& item, CollisionInfo& coll, PointCollisionData&
auto deltaPose = Pose(deltaPos, deltaOrient);
// Item is grounded and bridge position changed; set shift.
if (deltaPose != Pose::Zero && !item.Animation.IsAirborne)
if (deltaPose != Pose::Zero && !item.Animation.IsAirborne &&
item.IsLara() ? (GetLaraInfo(item).Control.WaterStatus != WaterStatus::Underwater && GetLaraInfo(item).Control.WaterStatus != WaterStatus::FlyCheat) : true)
{
const auto& bridgePos = bridgeItem.Pose.Position;