zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-25 09:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the automap glitch in the region around the full status bar in Polymost

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7331 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-02-18 22:02:42 +00:00
parent e5c8c8c4fc
commit 180c73d8ca
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/build/src/2d.cpp
View file

@ -138,6 +138,35 @@ static void drawlinegl(int32_t x1, int32_t y1, int32_t x2, int32_t y2, palette_t
polymost_useColorOnly(true); polymost_useColorOnly(true);
glBegin(GL_LINES); glBegin(GL_LINES);
glColor4ub(p.r, p.g, p.b, 255); glColor4ub(p.r, p.g, p.b, 255);
int const dx = x2-x1;
int const dy = y2-y1;
if (dx >= 0)
{
if ((x1 >= wx2) || (x2 < wx1)) return;
if (x1 < wx1) y1 += scale(wx1-x1, dy, dx), x1 = wx1;
if (x2 > wx2) y2 += scale(wx2-x2, dy, dx), x2 = wx2;
}
else
{
if ((x2 >= wx2) || (x1 < wx1)) return;
if (x2 < wx1) y2 += scale(wx1-x2, dy, dx), x2 = wx1;
if (x1 > wx2) y1 += scale(wx2-x1, dy, dx), x1 = wx2;
}
if (dy >= 0)
{
if ((y1 >= wy2) || (y2 < wy1)) return;
if (y1 < wy1) x1 += scale(wy1-y1, dx, dy), y1 = wy1;
if (y2 > wy2) x2 += scale(wy2-y2, dx, dy), y2 = wy2;
}
else
{
if ((y2 >= wy2) || (y1 < wy1)) return;
if (y2 < wy1) x2 += scale(wy1-y2, dx, dy), y2 = wy1;
if (y1 > wy2) x1 += scale(wy2-y1, dx, dy), y1 = wy2;
}
glVertex2f((float) x1 * (1.f/4096.f), (float) y1 * (1.f/4096.f)); glVertex2f((float) x1 * (1.f/4096.f), (float) y1 * (1.f/4096.f));
glVertex2f((float) x2 * (1.f/4096.f), (float) y2 * (1.f/4096.f)); glVertex2f((float) x2 * (1.f/4096.f), (float) y2 * (1.f/4096.f));

6
source/duke3d/src/screens.cpp
View file

@ -1102,6 +1102,12 @@ void G_DisplayRest(int32_t smoothratio)
if (ud.overhead_on == 2) if (ud.overhead_on == 2)
{ {
videoClearViewableArea(0L); videoClearViewableArea(0L);
#ifdef USE_OPENGL
if (videoGetRenderMode() >= REND_POLYMOST)
{
G_DrawBackground(); // Necessary GL fills the entire screen with black
}
#endif
renderDrawMapView(cposx, cposy, pp->zoom, cang); renderDrawMapView(cposx, cposy, pp->zoom, cang);
} }
G_DrawOverheadMap(cposx, cposy, pp->zoom, cang); G_DrawOverheadMap(cposx, cposy, pp->zoom, cang);