thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hyudoro: smoothly transition vertical position in hovering stack

Browse source
This commit is contained in:
James R. 2023-09-17 19:49:46 -07:00
parent 3b19376848
commit d86aaa8c0c
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/objects/hyudoro.c
View file

@ -162,6 +162,28 @@ project_hyudoro (mobj_t *hyu)
} }
} }
static void
rise_thru_stack (mobj_t *hyu)
{
mobj_t *target = hyudoro_target(hyu);
fixed_t spacer = ((target->height / 2) +
(hyu->height * 2));
fixed_t sink = hyudoro_stackpos(hyu) * spacer;
fixed_t zofs = abs(hyu->momz);
fixed_t d = (zofs - sink);
fixed_t speed = d / 8;
if (abs(d) < abs(speed))
zofs = sink;
else
zofs -= speed;
hyu->momz = zofs * P_MobjFlip(target);
}
static void static void
project_hyudoro_hover (mobj_t *hyu) project_hyudoro_hover (mobj_t *hyu)
{ {
@ -171,19 +193,18 @@ project_hyudoro_hover (mobj_t *hyu)
angle_t ang = get_look_angle(target) + ANGLE_67h; angle_t ang = get_look_angle(target) + ANGLE_67h;
fixed_t rad = (target->radius * 2) + hyu->radius; fixed_t rad = (target->radius * 2) + hyu->radius;
fixed_t zofs = hyudoro_stackpos(hyu) *
((target->height / 2) + (hyu->height * 2));
P_MoveOrigin(hyu, P_MoveOrigin(hyu,
target->x - P_ReturnThrustX(hyu, ang, rad), target->x - P_ReturnThrustX(hyu, ang, rad),
target->y - P_ReturnThrustY(hyu, ang, rad), target->y - P_ReturnThrustY(hyu, ang, rad),
target->z + (zofs * P_MobjFlip(target))); target->z);
// Cancel momentum from HYU_RETURN. // Cancel momentum from HYU_RETURN.
// (And anything else! I don't trust this game!!) // (And anything else! I don't trust this game!!)
hyu->momx = 0; hyu->momx = 0;
hyu->momy = 0; hyu->momy = 0;
rise_thru_stack(hyu);
hyu->angle = ang; hyu->angle = ang;
// copies sprite tilting // copies sprite tilting
@ -603,9 +624,6 @@ Obj_HyudoroDeploy (mobj_t *master)
void void
Obj_HyudoroThink (mobj_t *hyu) Obj_HyudoroThink (mobj_t *hyu)
{ {
// Might get set from clipping slopes
hyu->momz = 0;
switch (hyudoro_mode(hyu)) switch (hyudoro_mode(hyu))
{ {
case HYU_PATROL: case HYU_PATROL: