room: fix ceiling height miscalculation

Resolves #323.
This commit is contained in:
lahm86 2023-05-12 11:28:57 +01:00 committed by GitHub
parent 2fadd3f2ef
commit d53c0b4af7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions

View file

@ -6,6 +6,7 @@
- added a camera speed option for the manual camera (#815)
- added an option to fix original texture issues (#826)
- fixed sounds stopping instead of pausing if game sounds in inventory are disabled (#717)
- fixed ceiling heights at times being miscalculated, resulting in camera issues and Lara being able to jump into the ceiling (#323)
- changed shaders to use GLSL 1.20 which should fix most issues with OpenGL 2.1 (#327, #685)
## [2.14](https://github.com/rr-/Tomb1Main/compare/2.13.2...2.14) - 2023-04-05

View file

@ -277,6 +277,7 @@ Not all options are turned on by default. Refer to `Tomb1Main_ConfigTool.exe` fo
- fixed a game crash on shutdown if the action button is held down
- fixed Scion 1 respawning on load
- fixed triggered flip effects not working if there are no sound devices
- fixed ceiling heights at times being miscalculated, resulting in camera issues and Lara being able to jump into the ceiling
#### Cheats
- added a fly cheat

View file

@ -306,6 +306,7 @@ int16_t Room_GetCeiling(FLOOR_INFO *floor, int32_t x, int32_t y, int32_t z)
{
int16_t *data;
int16_t type;
int16_t ended;
int16_t trigger;
FLOOR_INFO *f = floor;
@ -320,9 +321,10 @@ int16_t Room_GetCeiling(FLOOR_INFO *floor, int32_t x, int32_t y, int32_t z)
if (f->index) {
data = &g_FloorData[f->index];
type = *data++ & DATA_TYPE;
type = *data & DATA_TYPE;
ended = *data++ & END_BIT;
if (type == FT_TILT) {
if (!ended && type == FT_TILT) {
data++;
type = *data++ & DATA_TYPE;
}