diff options
author | Max Horn | 2003-05-10 21:49:59 +0000 |
---|---|---|
committer | Max Horn | 2003-05-10 21:49:59 +0000 |
commit | acb35fc915284cb3b194ba8864eb24e39fff992e (patch) | |
tree | dfc1dd77fcda48c14ee8ea0e898cdbd023a14344 /scumm/script.cpp | |
parent | e5fe73726a554d312f30682508d2474c8734b0ef (diff) | |
download | scummvm-rg350-acb35fc915284cb3b194ba8864eb24e39fff992e.tar.gz scummvm-rg350-acb35fc915284cb3b194ba8864eb24e39fff992e.tar.bz2 scummvm-rg350-acb35fc915284cb3b194ba8864eb24e39fff992e.zip |
renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r-- | scumm/script.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 728b84cadf..4e7c21495e 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -517,7 +517,7 @@ void Scumm::drawBox(int x, int y, int x2, int y2, int color) { x2++; y2++; - if (x > _realWidth - 1) + if (x > _screenWidth - 1) return; if (x < 0) x = 0; @@ -525,25 +525,25 @@ void Scumm::drawBox(int x, int y, int x2, int y2, int color) { y = 0; if (x2 < 0) return; - if (x2 > _realWidth - 1) - x2 = _realWidth - 1; + if (x2 > _screenWidth - 1) + x2 = _screenWidth - 1; if (y2 > bottom - 1) y2 = bottom - 1; updateDirtyRect(vs->number, x, x2, y - top, y2 - top, 0); - backbuff = vs->screenPtr + vs->xstart + (y - top) * _realWidth + x; + backbuff = vs->screenPtr + vs->xstart + (y - top) * _screenWidth + x; if (color == -1) { if (vs->number != 0) error("can only copy bg to main window"); - bgbuff = getResourceAddress(rtBuffer, vs->number + 5) + vs->xstart + (y - top) * _realWidth + x; + bgbuff = getResourceAddress(rtBuffer, vs->number + 5) + vs->xstart + (y - top) * _screenWidth + x; blit(backbuff, bgbuff, x2 - x, y2 - y); } else { count = y2 - y; while (count) { memset(backbuff, color, x2 - x); - backbuff += _realWidth; + backbuff += _screenWidth; count--; } } |