zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-27 22:22:08 +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-09-11 00:45:40 +02:00
commit be647dc7b2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/c_console.cpp
View file

@ -811,8 +811,8 @@ static void C_DrawNotifyText ()
DTA_KeepRatio, true, DTA_KeepRatio, true,
DTA_AlphaF, alpha, TAG_DONE); DTA_AlphaF, alpha, TAG_DONE);
else else
screen->DrawText (SmallFont, color, (screen->GetWidth() / active_con_scaletext() - screen->DrawText (SmallFont, color, (screen->GetWidth() -
SmallFont->StringWidth (NotifyStrings[i].Text))/ active_con_scaletext(), SmallFont->StringWidth (NotifyStrings[i].Text) * active_con_scaletext()) / 2 / active_con_scaletext(),
line, NotifyStrings[i].Text, line, NotifyStrings[i].Text,
DTA_VirtualWidth, screen->GetWidth() / active_con_scaletext(), DTA_VirtualWidth, screen->GetWidth() / active_con_scaletext(),
DTA_VirtualHeight, screen->GetHeight() / active_con_scaletext(), DTA_VirtualHeight, screen->GetHeight() / active_con_scaletext(),

2
src/r_main.cpp
View file

@ -678,7 +678,7 @@ void R_EnterPortal (PortalDrawseg* pds, int depth)
ViewPos.X = (x1 + r * dx)*2 - x; ViewPos.X = (x1 + r * dx)*2 - x;
ViewPos.Y = (y1 + r * dy)*2 - y; ViewPos.Y = (y1 + r * dy)*2 - y;
} }
ViewAngle = pds->src->Delta().Angle() - startang; ViewAngle = pds->src->Delta().Angle() * 2 - startang;
} }
else else
{ {