diff options
| author | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
| commit | d4c92983920cfe3b25a22d91e12c750e591b917e (patch) | |
| tree | c0b63318b9ba0e67528337cfaa21515def1c3962 /engines/gob/draw_v2.cpp | |
| parent | 7e2edf16b3e2bf1d2b31999979a60802514df6cb (diff) | |
| parent | cf107e24be28c7e6db65b5c7ffed120af4a7994b (diff) | |
| download | scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.gz scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.bz2 scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/gob/draw_v2.cpp')
| -rw-r--r-- | engines/gob/draw_v2.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp index 15a8f7ff8e..cc8f6b5e3c 100644 --- a/engines/gob/draw_v2.cpp +++ b/engines/gob/draw_v2.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/endian.h" @@ -899,17 +896,12 @@ void Draw_v2::spriteOperation(int16 operation) { _spriteTop = spriteTop; _spriteRight = spriteRight; _spriteBottom = spriteBottom; - _destSpriteX = destSpriteX; + if (operation != DRAW_PRINTTEXT) + _destSpriteX = destSpriteX; _destSpriteY = destSpriteY; _destSurface = destSurface; _sourceSurface = sourceSurface; - if (operation == DRAW_PRINTTEXT) { - len = _fonts[_fontIndex]->getCharWidth(); - adjustCoords(1, &len, 0); - _destSpriteX += len * strlen(_textToPrint); - } - if ((_renderFlags & RENDERFLAG_USEDELTAS) && !deltaVeto) { if (_sourceSurface == kBackSurface) { _spriteLeft -= _backDeltaX; |