zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Convert DoPlayerDeathHoriz() to work on pitch and remove now-unused buildhoriz().

Browse source
This commit is contained in:
Mitchell Richters 2022-09-27 15:15:01 +10:00 committed by Christoph Oelckers
parent 92798b5a07
commit a952c35669
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/fixedhorizon.h
View file

@ -67,7 +67,6 @@ class fixedhoriz
constexpr fixedhoriz(fixed_t v) : value(v) {} constexpr fixedhoriz(fixed_t v) : value(v) {}
friend constexpr fixedhoriz buildhoriz(int v);
friend fixedhoriz pitchhoriz(double v); friend fixedhoriz pitchhoriz(double v);
friend FSerializer &Serialize(FSerializer &arc, const char *key, fixedhoriz &obj, fixedhoriz *defval); friend FSerializer &Serialize(FSerializer &arc, const char *key, fixedhoriz &obj, fixedhoriz *defval);
@ -176,7 +175,6 @@ public:
} }
}; };
inline constexpr fixedhoriz buildhoriz(int v) { return fixedhoriz(IntToFixed(v)); }
inline fixedhoriz pitchhoriz(double v) { return fixedhoriz(fixed_t(clamp<double>(IntToFixed(128) * tan(v * (pi::pi() / 180.)), -INT32_MAX, INT32_MAX))); } inline fixedhoriz pitchhoriz(double v) { return fixedhoriz(fixed_t(clamp<double>(IntToFixed(128) * tan(v * (pi::pi() / 180.)), -INT32_MAX, INT32_MAX))); }
inline FSerializer &Serialize(FSerializer &arc, const char *key, fixedhoriz &obj, fixedhoriz *defval) inline FSerializer &Serialize(FSerializer &arc, const char *key, fixedhoriz &obj, fixedhoriz *defval)

30
source/games/sw/src/player.cpp
View file

@ -5788,6 +5788,10 @@ enum
PLAYER_DEATH_HORIZ_FALL_VALUE = -50 PLAYER_DEATH_HORIZ_FALL_VALUE = -50
}; };
constexpr double PLAYER_DEATH_HORIZ_UP_VALUEF = 22.922;
constexpr double PLAYER_DEATH_HORIZ_JUMP_VALUEF = 21.33686;
constexpr double PLAYER_DEATH_HORIZ_FALL_VALUEF = -PLAYER_DEATH_HORIZ_JUMP_VALUEF;
void DoPlayerBeginDie(PLAYER* pp) void DoPlayerBeginDie(PLAYER* pp)
{ {
extern bool ReloadPrompt; extern bool ReloadPrompt;
@ -6000,16 +6004,16 @@ void DoPlayerBeginDie(PLAYER* pp)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void DoPlayerDeathHoriz(PLAYER* pp, short target, short speed) static void DoPlayerDeathHoriz(PLAYER* pp, double target, double speed)
{ {
if ((pp->horizon.horiz.asbuild() - target) > 1) if ((pp->horizon.horiz.Degrees() - target) > 0.4476)
{ {
pp->horizon.addadjustment(buildhoriz(-speed)); pp->horizon.addadjustment(pitchhoriz(-speed));
} }
if ((target - pp->horizon.horiz.asbuild()) > 1) if ((target - pp->horizon.horiz.Degrees()) > 0.4476)
{ {
pp->horizon.addadjustment(buildhoriz(speed)); pp->horizon.addadjustment(pitchhoriz(speed));
} }
} }
@ -6076,7 +6080,7 @@ void DoPlayerDeathFollowKiller(PLAYER* pp)
{ {
// if it didn't make it to this angle because of a low ceiling or something // if it didn't make it to this angle because of a low ceiling or something
// continue on to it // continue on to it
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUE, 4); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 1.79);
// allow turning // allow turning
if (pp->Flags & (PF_DEAD_HEAD|PF_HEAD_CONTROL)) if (pp->Flags & (PF_DEAD_HEAD|PF_HEAD_CONTROL))
@ -6345,7 +6349,7 @@ void DoPlayerDeathFlip(PLAYER* pp)
if ((pp->Flags & PF_JUMPING)) if ((pp->Flags & PF_JUMPING))
{ {
DoPlayerDeathJump(pp); DoPlayerDeathJump(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUE, 2); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 0.8952);
if (MoveSkip2 == 0) if (MoveSkip2 == 0)
DoJump(pp->actor); DoJump(pp->actor);
} }
@ -6353,7 +6357,7 @@ void DoPlayerDeathFlip(PLAYER* pp)
if ((pp->Flags & PF_FALLING)) if ((pp->Flags & PF_FALLING))
{ {
DoPlayerDeathFall(pp); DoPlayerDeathFall(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUE, 4); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 1.79);
if (MoveSkip2 == 0) if (MoveSkip2 == 0)
DoFall(pp->actor); DoFall(pp->actor);
} }
@ -6388,7 +6392,7 @@ void DoPlayerDeathDrown(PLAYER* pp)
if ((pp->Flags & PF_JUMPING)) if ((pp->Flags & PF_JUMPING))
{ {
DoPlayerDeathJump(pp); DoPlayerDeathJump(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUE, 2); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_UP_VALUEF, 0.8952);
if (MoveSkip2 == 0) if (MoveSkip2 == 0)
DoJump(pp->actor); DoJump(pp->actor);
} }
@ -6465,13 +6469,13 @@ void DoPlayerDeathCrumble(PLAYER* pp)
if ((pp->Flags & PF_JUMPING)) if ((pp->Flags & PF_JUMPING))
{ {
DoPlayerDeathJump(pp); DoPlayerDeathJump(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_JUMP_VALUE, 4); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_JUMP_VALUEF, 1.79);
} }
if ((pp->Flags & PF_FALLING)) if ((pp->Flags & PF_FALLING))
{ {
DoPlayerDeathFall(pp); DoPlayerDeathFall(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_FALL_VALUE, 3); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_FALL_VALUEF, 1.343);
} }
if (!(pp->Flags & (PF_JUMPING|PF_FALLING))) if (!(pp->Flags & (PF_JUMPING|PF_FALLING)))
@ -6523,13 +6527,13 @@ void DoPlayerDeathExplode(PLAYER* pp)
if ((pp->Flags & PF_JUMPING)) if ((pp->Flags & PF_JUMPING))
{ {
DoPlayerDeathJump(pp); DoPlayerDeathJump(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_JUMP_VALUE, 4); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_JUMP_VALUEF, 1.79);
} }
if ((pp->Flags & PF_FALLING)) if ((pp->Flags & PF_FALLING))
{ {
DoPlayerDeathFall(pp); DoPlayerDeathFall(pp);
DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_JUMP_VALUE, 3); DoPlayerDeathHoriz(pp, PLAYER_DEATH_HORIZ_JUMP_VALUEF, 1.343);
} }
if (!(pp->Flags & (PF_JUMPING|PF_FALLING))) if (!(pp->Flags & (PF_JUMPING|PF_FALLING)))