zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-12-01 16:11:37 +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-04-06 22:09:47 +02:00
commit 3d44613377
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/am_map.cpp
View file

@ -2645,7 +2645,7 @@ void AM_drawPlayers ()
pt.y = pos.Y; pt.y = pos.Y;
if (am_rotate == 1 || (am_rotate == 2 && viewactive)) if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{ {
angle = 90.; angle = -90.;
AM_rotatePoint (&pt.x, &pt.y); AM_rotatePoint (&pt.x, &pt.y);
} }
else else
@ -2806,7 +2806,7 @@ void AM_drawThings ()
if (frame->Texture[0] != frame->Texture[1]) angle += 180. / 16; if (frame->Texture[0] != frame->Texture[1]) angle += 180. / 16;
if (am_rotate == 1 || (am_rotate == 2 && viewactive)) if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{ {
angle += players[consoleplayer].camera->Angles.Yaw - 90.; angle += players[consoleplayer].camera->Angles.Yaw + 90.;
} }
rotation = int((angle.Normalized360() * (16. / 360.)).Degrees); rotation = int((angle.Normalized360() * (16. / 360.)).Degrees);
@ -2830,7 +2830,7 @@ void AM_drawThings ()
if (am_rotate == 1 || (am_rotate == 2 && viewactive)) if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{ {
AM_rotatePoint (&p.x, &p.y); AM_rotatePoint (&p.x, &p.y);
angle += -players[consoleplayer].camera->Angles.Yaw + 90.; angle += -players[consoleplayer].camera->Angles.Yaw - 90.;
} }
color = AMColors[AMColors.ThingColor]; color = AMColors[AMColors.ThingColor];

2
src/p_effect.cpp
View file

@ -587,7 +587,7 @@ void P_DrawSplash2 (int count, const DVector3 &pos, DAngle angle, int updown, in
break; break;
} }
zvel = -0.5; zvel = -1./512.;
zspread = updown ? -6000 / 65536. : 6000 / 65536.; zspread = updown ? -6000 / 65536. : 6000 / 65536.;
zadd = (updown == 2) ? 128 : 0; zadd = (updown == 2) ? 128 : 0;

2
src/p_setup.cpp
View file

@ -1314,7 +1314,7 @@ void P_LoadSegs (MapData * map)
// errors _can_ cause firelines. // errors _can_ cause firelines.
DAngle ptp_angle = (li->v2->fPos() - li->v1->fPos()).Angle(); DAngle ptp_angle = (li->v2->fPos() - li->v1->fPos()).Angle();
DAngle seg_angle = AngleToFloat(segangle); DAngle seg_angle = AngleToFloat(segangle << 16);
DAngle delta_angle = absangle(ptp_angle, seg_angle); DAngle delta_angle = absangle(ptp_angle, seg_angle);
if (delta_angle >= 1.) if (delta_angle >= 1.)