Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
f0192a2349
93 changed files with 939 additions and 934 deletions
|
|
@ -2310,8 +2310,8 @@ void DPusher::Tick ()
|
|||
if (m_Source->GetClass()->TypeName == NAME_PointPusher)
|
||||
pushangle += ANG180; // away
|
||||
pushangle >>= ANGLETOFINESHIFT;
|
||||
thing->velx += FixedMul (speed, finecosine[pushangle]);
|
||||
thing->vely += FixedMul (speed, finesine[pushangle]);
|
||||
thing->vel.x += FixedMul (speed, finecosine[pushangle]);
|
||||
thing->vel.y += FixedMul (speed, finesine[pushangle]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2385,8 +2385,8 @@ void DPusher::Tick ()
|
|||
yspeed = m_Ymag;
|
||||
}
|
||||
}
|
||||
thing->velx += xspeed<<(FRACBITS-PUSH_FACTOR);
|
||||
thing->vely += yspeed<<(FRACBITS-PUSH_FACTOR);
|
||||
thing->vel.x += xspeed<<(FRACBITS-PUSH_FACTOR);
|
||||
thing->vel.y += yspeed<<(FRACBITS-PUSH_FACTOR);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue