Merge branch 'player-speed' into 'next'
Make player->speed and other things use R_PointToDist2 See merge request STJr/SRB2!1309
This commit is contained in:
commit
9649a9fbae
|
@ -1834,7 +1834,7 @@ void A_SnailerThink(mobj_t *actor)
|
||||||
fixed_t dist;
|
fixed_t dist;
|
||||||
fixed_t dx, dy;
|
fixed_t dx, dy;
|
||||||
|
|
||||||
dist = P_AproxDistance(actor->x - actor->target->x, actor->y - actor->target->y);
|
dist = R_PointToDist2(0, 0, actor->x - actor->target->x, actor->y - actor->target->y);
|
||||||
|
|
||||||
if (an > ANGLE_45 && an <= ANGLE_90) // fire at 45 degrees to the left
|
if (an > ANGLE_45 && an <= ANGLE_90) // fire at 45 degrees to the left
|
||||||
{
|
{
|
||||||
|
|
|
@ -5924,7 +5924,7 @@ static void P_3dMovement(player_t *player)
|
||||||
player->rmomy = player->mo->momy - player->cmomy;
|
player->rmomy = player->mo->momy - player->cmomy;
|
||||||
|
|
||||||
// Calculates player's speed based on distance-of-a-line formula
|
// Calculates player's speed based on distance-of-a-line formula
|
||||||
player->speed = P_AproxDistance(player->rmomx, player->rmomy);
|
player->speed = R_PointToDist2(0, 0, player->rmomx, player->rmomy);
|
||||||
|
|
||||||
// Monster Iestyn - 04-11-13
|
// Monster Iestyn - 04-11-13
|
||||||
// Quadrants are stupid, excessive and broken, let's do this a much simpler way!
|
// Quadrants are stupid, excessive and broken, let's do this a much simpler way!
|
||||||
|
|
Loading…
Reference in New Issue