diff options
| author | Paweł Kołodziejski | 2002-10-27 08:28:41 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-10-27 08:28:41 +0000 |
| commit | 9c0959680286936d6e13f778c1f5f98781ae16ba (patch) | |
| tree | 64bc4990c8260057870a95dc7ef106f6c4f9c6d6 /scumm/string.cpp | |
| parent | 6e3e0d4f5459821cfcbadf81a26e802ddea732ce (diff) | |
| download | scummvm-rg350-9c0959680286936d6e13f778c1f5f98781ae16ba.tar.gz scummvm-rg350-9c0959680286936d6e13f778c1f5f98781ae16ba.tar.bz2 scummvm-rg350-9c0959680286936d6e13f778c1f5f98781ae16ba.zip | |
removed hardcoded values
svn-id: r5328
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 71553db06a..6715e3a86d 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -219,8 +219,8 @@ void Scumm::CHARSET_1() if (_string[0].xpos < 80) _string[0].xpos = 80; - if (_string[0].xpos > 240) - _string[0].xpos = 240; + if (_string[0].xpos > _realWidth - 80) + _string[0].xpos = _realWidth - 80; } else { s = a->scaley * a->new_1 / 0xFF; _string[0].ypos = ((a->new_1 - s) >> 1) + s - a->elevation + a->y; @@ -234,8 +234,8 @@ void Scumm::CHARSET_1() _string[0].xpos = ((a->new_2 - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2); if (_string[0].xpos < 80) _string[0].xpos = 80; - if (_string[0].xpos > 240) - _string[0].xpos = 240; + if (_string[0].xpos > _realWidth - 80) + _string[0].xpos = _realWidth - 80; } } @@ -1038,7 +1038,7 @@ void CharsetRenderer::printChar(int chr) } _mask_ptr = _vm->getResourceAddress(rtBuffer, 9) - + _drawTop * 40 + _left / 8 + _vm->_screenStartStrip; + + _drawTop * _vm->gdi._numStrips + _left / 8 + _vm->_screenStartStrip; _virtScreenHeight = vs->height; _charPtr += 4; |