zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2016-08-14 22:11:17 +02:00
commit 0a555038e3
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_scroll.cpp
View file

@ -345,16 +345,12 @@ DScroller::DScroller (double dx, double dy, const line_t *l,
int control, int accel, EScrollPos scrollpos) int control, int accel, EScrollPos scrollpos)
: DThinker (STAT_SCROLLER) : DThinker (STAT_SCROLLER)
{ {
if (tagManager.GetFirstLineID(l) == 300)
{
int a = 0;
}
double x = fabs(l->Delta().X), y = fabs(l->Delta().Y), d; double x = fabs(l->Delta().X), y = fabs(l->Delta().Y), d;
if (y > x) d = x, x = y, y = d; if (y > x) d = x, x = y, y = d;
d = x / g_sin(g_atan2(y, x) + M_PI / 2); d = x / g_sin(g_atan2(y, x) + M_PI / 2);
x = (-dy * l->Delta().Y + dx * l->Delta().X) / d; x = -(dy * l->Delta().Y + dx * l->Delta().X) / d;
y = (-dx * l->Delta().Y - dy * l->Delta().X) / d; y = -(dx * l->Delta().Y - dy * l->Delta().X) / d;
m_Type = EScroll::sc_side; m_Type = EScroll::sc_side;
m_dx = x; m_dx = x;