- Fixed scrolling of the automap background on a rotated automap.

SVN r1408 (trunk)
This commit is contained in:
Randy Heit 2009-02-07 00:07:55 +00:00
parent a704043fd2
commit f867f40bab
2 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,6 @@
February 6, 2009
- Fixed scrolling of the automap background on a rotating automap.
February 5, 2009
- Changed singleplayer allowrespawn to act like a co-op game when you
change levels while dead by immediately respawning you before the switch

View file

@ -593,10 +593,13 @@ void AM_changeWindowLoc ()
}
int oldmx = m_x, oldmy = m_y;
fixed_t incx = m_paninc.x, incy = m_paninc.y;
fixed_t incx, incy, oincx, oincy;
incx = Scale(m_paninc.x, SCREENWIDTH, 320);
incy = Scale(m_paninc.y, SCREENHEIGHT, 200);
incx = m_paninc.x;
incy = m_paninc.y;
oincx = incx = Scale(m_paninc.x, SCREENWIDTH, 320);
oincy = incy = Scale(m_paninc.y, SCREENHEIGHT, 200);
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{
AM_rotate(&incx, &incy, players[consoleplayer].camera->angle - ANG90);
@ -606,7 +609,7 @@ void AM_changeWindowLoc ()
m_y += incy;
AM_ClipRotatedExtents (oldmx + m_w/2, oldmy + m_h/2);
AM_ScrollParchment (m_x - oldmx, oldmy - m_y);
AM_ScrollParchment (m_x != oldmx ? oincx : 0, m_y != oldmy ? -oincy : 0);
}