Revert "- xs_Float.h: Make all inlines return an unsigned value, and change previous unsigned inlines to signed."

Revert "- `xs_Float.h`: Add `getint()` getter to `_xs_doubleints` struct."
Revert "- SW: When adjusting horizon in `DoPlayerDeathHoriz()`, just use integer horizon values and not Q16.16."
Revert "- Duke (RR): Clean up some unnecessary `FixedToFloat()` usage with the `fixedhoriz` `asbuildf()` method."
Revert "- `binaryangle.h`: Use `constexpr` on inline functions where it was previously not possible to do so."
Revert "- `m_fixed.h`: Use `constexpr` on inline functions where it was previously not possible to do so."
Revert "- `xs_Float.h`: Convert header to `constexpr`."

This does nor work as it violates the constexpr rules for unions. The code will error out on compilation for accessing an inactive member of a union.
This commit is contained in:
Christoph Oelckers 2021-11-01 20:25:38 +01:00
parent d9bbe1fa61
commit 86166f5e67
5 changed files with 116 additions and 100 deletions

View file

@ -6038,12 +6038,12 @@ DoPlayerBeginDie(PLAYERp pp)
void
DoPlayerDeathHoriz(PLAYERp pp, short target, short speed)
{
if ((pp->horizon.horiz.asbuild() - target) > 1)
if ((pp->horizon.horiz.asq16() - IntToFixed(target)) > FRACUNIT)
{
pp->horizon.addadjustment(-speed);
}
if ((target - pp->horizon.horiz.asbuild()) > 1)
if ((IntToFixed(target) - pp->horizon.horiz.asq16()) > FRACUNIT)
{
pp->horizon.addadjustment(speed);
}