OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-12 16:55:59 +01:00
commit f0192a2349
93 changed files with 939 additions and 934 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/p_lnspec.cpp
View file

@ -1132,12 +1132,12 @@ FUNC(LS_ThrustThing)
static void ThrustThingHelper (AActor *it, angle_t angle, int force, INTBOOL nolimit)
{
angle >>= ANGLETOFINESHIFT;
it->velx += force * finecosine[angle];
it->vely += force * finesine[angle];
it->vel.x += force * finecosine[angle];
it->vel.y += force * finesine[angle];
if (!nolimit)
{
it->velx = clamp<fixed_t> (it->velx, -MAXMOVE, MAXMOVE);
it->vely = clamp<fixed_t> (it->vely, -MAXMOVE, MAXMOVE);
it->vel.x = clamp<fixed_t> (it->vel.x, -MAXMOVE, MAXMOVE);
it->vel.y = clamp<fixed_t> (it->vel.y, -MAXMOVE, MAXMOVE);
}
}
@ -1158,18 +1158,18 @@ FUNC(LS_ThrustThingZ) // [BC]
while ( (victim = iterator.Next ()) )
{
if (!arg3)
victim->velz = thrust;
victim->vel.z = thrust;
else
victim->velz += thrust;
victim->vel.z += thrust;
}
return true;
}
else if (it)
{
if (!arg3)
it->velz = thrust;
it->vel.z = thrust;
else
it->velz += thrust;
it->vel.z += thrust;
return true;
}
return false;
@ -1700,8 +1700,8 @@ FUNC(LS_Thing_Stop)
{
if (it != NULL)
{
it->velx = it->vely = it->velz = 0;
if (it->player != NULL) it->player->velx = it->player->vely = 0;
it->vel.x = it->vel.y = it->vel.z = 0;
if (it->player != NULL) it->player->vel.x = it->player->vel.y = 0;
ok = true;
}
}
@ -1711,8 +1711,8 @@ FUNC(LS_Thing_Stop)
while ( (target = iterator.Next ()) )
{
target->velx = target->vely = target->velz = 0;
if (target->player != NULL) target->player->velx = target->player->vely = 0;
target->vel.x = target->vel.y = target->vel.z = 0;
if (target->player != NULL) target->player->vel.x = target->player->vel.y = 0;
ok = true;
}
}
@ -3294,9 +3294,9 @@ FUNC(LS_GlassBreak)
glass->angle = an;
an >>= ANGLETOFINESHIFT;
speed = pr_glass() & 3;
glass->velx = finecosine[an] * speed;
glass->vely = finesine[an] * speed;
glass->velz = (pr_glass() & 7) << FRACBITS;
glass->vel.x = finecosine[an] * speed;
glass->vel.y = finesine[an] * speed;
glass->vel.z = (pr_glass() & 7) << FRACBITS;
// [RH] Let the shards stick around longer than they did in Strife.
glass->tics += pr_glass();
}