tr2/objects/boat: fix initial water height test

This fixes the boat's initial water height test when Lara is climbing
on to avoid tinting it unnecessarily.

Resolves #2787.
This commit is contained in:
lahm86 2025-04-20 12:17:12 +01:00
parent 747f0af086
commit 0c0ce5bcf6
3 changed files with 3 additions and 1 deletions

View file

@ -39,6 +39,7 @@
- fixed a potential softlock in Nightmare in Vegas where the bird monster could remain inactive, or the flip map not set (#1851) - fixed a potential softlock in Nightmare in Vegas where the bird monster could remain inactive, or the flip map not set (#1851)
- fixed invalid portals in The Deck between rooms 17 and 104, which could result in Lara seeing enemies in disconnected rooms (#2393) - fixed invalid portals in The Deck between rooms 17 and 104, which could result in Lara seeing enemies in disconnected rooms (#2393)
- fixed pushblocks being rotated when Lara grabs them, most noticeable if asymmetric textures have been used (#2776) - fixed pushblocks being rotated when Lara grabs them, most noticeable if asymmetric textures have been used (#2776)
- fixed the boat briefly having an underwater hue when Lara first climbs on (#2787)
- fixed the camera going out of bounds in 60fps near specific invalid floor data (known as no-space) (#2764, regression from 0.10) - fixed the camera going out of bounds in 60fps near specific invalid floor data (known as no-space) (#2764, regression from 0.10)
- fixed sprites rendering black if no shade value is assigned in the level (#2701, regression from 0.8) - fixed sprites rendering black if no shade value is assigned in the level (#2701, regression from 0.8)
- fixed some 3D pickup items rendering black in software mode (#2792, regression from 0.10) - fixed some 3D pickup items rendering black in software mode (#2792, regression from 0.10)

View file

@ -290,6 +290,7 @@ as Notepad.
- fixed TGA screenshots crashing the game - fixed TGA screenshots crashing the game
- fixed the camera being cut off after using the gong hammer in Ice Palace - fixed the camera being cut off after using the gong hammer in Ice Palace
- fixed Lara's underwater hue being retained when re-entering a boat - fixed Lara's underwater hue being retained when re-entering a boat
- fixed the boat briefly having an underwater hue when Lara first climbs on
- fixed distant rooms sometimes not appearing, causing the skybox to be visible when it shouldn't - fixed distant rooms sometimes not appearing, causing the skybox to be visible when it shouldn't
- fixed rendering problems on certain Intel GPUs - fixed rendering problems on certain Intel GPUs
- fixed bubbles spawning from flares if Lara is in shallow water - fixed bubbles spawning from flares if Lara is in shallow water

View file

@ -657,7 +657,7 @@ static void M_Control(const int16_t item_num)
int16_t room_num = boat->room_num; int16_t room_num = boat->room_num;
const SECTOR *sector = const SECTOR *sector =
Room_GetSector(boat->pos.x, boat->pos.y, boat->pos.z, &room_num); Room_GetSector(boat->pos.x, boat->pos.y - 5, boat->pos.z, &room_num);
int32_t height = int32_t height =
Room_GetHeight(sector, boat->pos.x, boat->pos.y, boat->pos.z); Room_GetHeight(sector, boat->pos.x, boat->pos.y, boat->pos.z);
const int32_t ceiling = const int32_t ceiling =