OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'zmaster' into edf-gl

Browse source 
Conflicts:
	src/actor.h
This commit is contained in:
Christoph Oelckers 2016-01-11 15:10:10 +01:00
commit d5cf31f821
44 changed files with 330 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_spec.cpp
View file

@ -2234,7 +2234,7 @@ void DPusher::Tick ()
{
int sx = m_X;
int sy = m_Y;
int dist = P_AproxDistance (thing->x - sx,thing->y - sy);
int dist = thing->AproxDistance (sx, sy);
int speed = (m_Magnitude - ((dist>>FRACBITS)>>1))<<(FRACBITS-PUSH_FACTOR-1);
// If speed <= 0, you're outside the effective radius. You also have
@ -2242,7 +2242,7 @@ void DPusher::Tick ()
if ((speed > 0) && (P_CheckSight (thing, m_Source, SF_IGNOREVISIBILITY)))
{
angle_t pushangle = R_PointToAngle2 (thing->x, thing->y, sx, sy);
angle_t pushangle = thing->AngleTo(sx, sy);
if (m_Source->GetClass()->TypeName == NAME_PointPusher)
pushangle += ANG180; // away
pushangle >>= ANGLETOFINESHIFT;