[Scummvm-cvs-logs] SF.net SVN: scummvm:[55272] scummvm/trunk/engines/gob/draw_v2.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sun Jan 16 23:29:18 CET 2011
Revision: 55272
http://scummvm.svn.sourceforge.net/scummvm/?rev=55272&view=rev
Author: drmccoy
Date: 2011-01-16 22:29:18 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
GOB: Use the correct font and shade color in Urban Runner
Modified Paths:
--------------
scummvm/trunk/engines/gob/draw_v2.cpp
Modified: scummvm/trunk/engines/gob/draw_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_v2.cpp 2011-01-16 22:28:49 UTC (rev 55271)
+++ scummvm/trunk/engines/gob/draw_v2.cpp 2011-01-16 22:29:18 UTC (rev 55272)
@@ -737,7 +737,7 @@
case DRAW_FILLRECT:
_spritesArray[_destSurface]->fillRect(destSpriteX,
_destSpriteY, _destSpriteX + _spriteRight - 1,
- _destSpriteY + _spriteBottom - 1, _backColor);
+ _destSpriteY + _spriteBottom - 1, getColor(_backColor));
dirtiedRect(_destSurface, _destSpriteX, _destSpriteY,
_destSpriteX + _spriteRight - 1, _destSpriteY + _spriteBottom - 1);
@@ -794,17 +794,19 @@
len = *dataBuf++;
for (int i = 0; i < len; i++, dataBuf += 2) {
font->drawLetter(*_spritesArray[_destSurface], READ_LE_UINT16(dataBuf),
- _destSpriteX, _destSpriteY, _frontColor, _backColor, _transparency);
+ _destSpriteX, _destSpriteY, getColor(_frontColor),
+ getColor(_backColor), _transparency);
}
} else {
- drawString(_textToPrint, _destSpriteX, _destSpriteY, _frontColor,
- _backColor, _transparency, *_spritesArray[_destSurface], *font);
+ drawString(_textToPrint, _destSpriteX, _destSpriteY, getColor(_frontColor),
+ getColor(_backColor), _transparency, *_spritesArray[_destSurface], *font);
_destSpriteX += len * font->getCharWidth();
}
} else {
for (int i = 0; i < len; i++) {
font->drawLetter(*_spritesArray[_destSurface], _textToPrint[i],
- _destSpriteX, _destSpriteY, _frontColor, _backColor, _transparency);
+ _destSpriteX, _destSpriteY, getColor(_frontColor),
+ getColor(_backColor), _transparency);
_destSpriteX += font->getCharWidth(_textToPrint[i]);
}
}
@@ -865,7 +867,7 @@
if ((_backColor != 16) && (_backColor != 144)) {
_spritesArray[_destSurface]->fillRect(_destSpriteX, _destSpriteY,
_spriteRight, _spriteBottom,
- _backColor);
+ getColor(_backColor));
}
dirtiedRect(_destSurface, _destSpriteX, _destSpriteY, _spriteRight, _spriteBottom);
@@ -873,7 +875,7 @@
case DRAW_FILLRECTABS:
_spritesArray[_destSurface]->fillRect(_destSpriteX, _destSpriteY,
- _spriteRight, _spriteBottom, _backColor);
+ _spriteRight, _spriteBottom, getColor(_backColor));
dirtiedRect(_destSurface, _destSpriteX, _destSpriteY, _spriteRight, _spriteBottom);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list