libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

added coordinates clipping to ScummFont::drawChar(), this should make valgrind happy when displaying the about window.

Browse Source 
svn-id: r16147
This commit is contained in:
Gregory Montoir 2004-12-20 00:37:20 +00:00
parent 0e8d9b58d9
commit a01abe8942
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/scummfont.cpp
View File

@ -62,16 +62,20 @@ int ScummFont::getCharWidth(byte chr) const {
}
//void ScummFont::drawChar(byte chr, int xx, int yy, OverlayColor color) {
void ScummFont::drawChar(const Surface *dst, byte chr, int x, int y, uint32 color) const {
void ScummFont::drawChar(const Surface *dst, byte chr, int tx, int ty, uint32 color) const {
assert(dst != 0);
byte *ptr = (byte *)dst->pixels + x * dst->bytesPerPixel + y * dst->pitch;
byte *ptr = (byte *)dst->getBasePtr(tx, ty);
const byte *tmp = guifont + 6 + guifont[4] + chr * 8;
uint buffer = 0;
uint mask = 0;
for (y = 0; y < 8; y++) {
for (x = 0; x < 8; x++) {
for (int y = 0; y < 8; y++) {
if (ty + y < 0 || ty + y >= dst->h)
continue;
for (int x = 0; x < 8; x++) {
if (tx + x < 0 || tx + x >= dst->w)
continue;
unsigned char c;
mask >>= 1;
if (mask == 0) {