ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when drawing crosshair on screen edges (remove old workaround)

This commit is contained in:
OV2 2011-10-31 22:36:17 +01:00
parent 2c3230a8da
commit c188725ee4
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gfx.cpp
View File

@ -2242,43 +2242,37 @@ void S9xDrawCrosshair (const char *crosshair, uint8 fgcolor, uint8 bgcolor, int1
fg = get_crosshair_color(fgcolor); fg = get_crosshair_color(fgcolor);
bg = get_crosshair_color(bgcolor); bg = get_crosshair_color(bgcolor);
// XXX: FIXME: why does it crash without this on Linux port? There are no out-of-bound writes without it... uint16 *s = GFX.Screen + y * (int32)GFX.RealPPL + x;
#if (defined(__unix) || defined(__linux) || defined(__sun) || defined(__DJGPP))
if (x >= 0 && y >= 0) for (r = 0; r < 15 * rx; r++, s += GFX.RealPPL - 15 * cx)
#endif
{ {
uint16 *s = GFX.Screen + y * GFX.RealPPL + x; if (y + r < 0)
for (r = 0; r < 15 * rx; r++, s += GFX.RealPPL - 15 * cx)
{ {
if (y + r < 0) s += 15 * cx;
{ continue;
s += 15 * cx; }
if (y + r >= H)
break;
for (c = 0; c < 15 * cx; c++, s++)
{
if (x + c < 0 || s < GFX.Screen)
continue; continue;
}
if (y + r >= H) if (x + c >= W)
break;
for (c = 0; c < 15 * cx; c++, s++)
{ {
if (x + c < 0 || s < GFX.Screen) s += 15 * cx - c;
continue; break;
if (x + c >= W)
{
s += 15 * cx - c;
break;
}
uint8 p = crosshair[(r / rx) * 15 + (c / cx)];
if (p == '#' && fgcolor)
*s = (fgcolor & 0x10) ? COLOR_ADD1_2(fg, *s) : fg;
else
if (p == '.' && bgcolor)
*s = (bgcolor & 0x10) ? COLOR_ADD1_2(*s, bg) : bg;
} }
uint8 p = crosshair[(r / rx) * 15 + (c / cx)];
if (p == '#' && fgcolor)
*s = (fgcolor & 0x10) ? COLOR_ADD1_2(fg, *s) : fg;
else
if (p == '.' && bgcolor)
*s = (bgcolor & 0x10) ? COLOR_ADD1_2(*s, bg) : bg;
} }
} }
} }