rooms: move height vars and functions to TRX #2542
Conversation
This moves TR2's no floor indicator to TRX's room module.
This adds support for no floor in TR1, in the same style as TR2's Floating Islands. Resolves LostArtefacts#2541.
This moves Room_GetHeight to TRX, which in turn allows us to eliminate g_HeightType.
This moves Room_GetCeiling to TRX.
lahm86
requested review from
rr-,
walkawayy and
aredfan
and removed request for
a team
|
Download the built assets for this pull request: |
This renames the no floor internal concept to abyss.
|
Thanks @aredfan. That's a good point, and could cause issues in TR2 customs as well; the hard-coding of 16384 as the absolute abyss maximum causes this, as the height at the top of the platform in GP causes things to overflow (note there is other collision here just beyond the scion platform and near the sloped ceiling, but that's OG). I've adjusted it now so it calculates the absolute floor, based on the difference between 16384 and OG floater abyss value. It'd be worth flying around near the roof in Floater to see if everything looks ok with this, and see how GP looks too. Thanks! |
src/libtrx/game/rooms/common.c
Outdated
| @@ -511,12 +512,14 @@ SECTOR *Room_GetSkySector( | |||
|
|
|||
| void Room_SetAbyssHeight(const int16_t height) | |||
| { | |||
| m_AbyssHeight = height; | |||
| m_AbyssMinHeight = height; | |||
| m_AbyssMaxHeight = height == 0 ? 0 : m_AbyssMinHeight + 30 * STEP_L; | |||
There was a problem hiding this comment.
Hmm, what does 30 * STEP_L signify? Asking cause it doesn't match 16384 (16 tiles).
Also would be good to explain what is the min and max role in the calculations, as it's become quite confusing to me. I always thought it's a simple plane.
There was a problem hiding this comment.
My bad, I got my numbers muddled. I've set it now to 26 * STEP_L, so this is the difference between 16384 and Floater abyss height of 9728. This allows time when Lara is falling between setting her HP to 0 and the inventory showing, so that we don't hear Lara hit the floor. Although I've noticed that in OG, you can just hear the crunch SFX begin as the inventory opens, but we can perhaps address that separately.
We also clamp to just under the max height; in TombEditor in theory you could build a room this low.
I've added comments, hopefully they clear things up.
lahm86
force-pushed
the
trx-height-functions
branch
from
558e189 to
7164ca9
Compare
Rather than hardcoding the maximum abyss height to 16384, we calculate it based on the OG difference between this and Floating Islands abyss height. This avoids potential collision issues near the top of the level.
lahm86
force-pushed
the
trx-height-functions
branch
from
7164ca9 to
b7faeef
Compare
Resolves #2541.
Checklist
Description
This primarily replaces
g_HeightTypeandg_GF_NoFloorwith function calls in TRX, but also movesRoom_GetHeightandRoom_GetCeilingtogether as well for consistency. There remains some height specific logic in the separate modules, for example altering floor height, but that's linked with #2036 so can be handled separately there.It seemed sensible to offer
disable_floorin TR1 as part of this as it's quite a straight-forward feature.For testing, we can check floor and ceiling heights are OK, including slopes, plus the abyss in Floating Islands. You can also try an abyss in TR1; one I tried was setting the value to 4096 in Great Pyramid and then dropping off the starting ledge. It doesn't really make sense in OG environments though, so it's definitely more of a custom level feature.