thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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)

Browse source 
svn-id: r7423
This commit is contained in:
Max Horn 2003-05-10 21:49:59 +00:00
parent e5fe73726a
commit acb35fc915
21 changed files with 222 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/nut_renderer.cpp
View file

@ -198,9 +198,9 @@ void NutRenderer::drawChar(byte c, int32 x, int32 y, byte color, bool useMask) {
y += offsetY[i];
color = cTable[i];
dst = _vm->virtscr[0].screenPtr + y * _vm->_realWidth + x + _vm->virtscr[0].xstart;
dst = _vm->virtscr[0].screenPtr + y * _vm->_screenWidth + x + _vm->virtscr[0].xstart;
mask = _vm->getResourceAddress(rtBuffer, 9)
+ (y * _vm->_realWidth + x) / 8 + _vm->_screenStartStrip;
+ (y * _vm->_screenWidth + x) / 8 + _vm->_screenStartStrip;
src = _tmpCodecBuffer;
@ -209,7 +209,7 @@ void NutRenderer::drawChar(byte c, int32 x, int32 y, byte color, bool useMask) {
maskpos = 0;
for (int32 tx = 0; tx < width; tx++) {
byte pixel = *src++;
if (x + tx < 0 || x + tx >= _vm->_realWidth || y + ty < 0 || y + ty >= _vm->_realHeight)
if (x + tx < 0 || x + tx >= _vm->_screenWidth || y + ty < 0 || y + ty >= _vm->_screenHeight)
continue;
#if 1
if (pixel != 0) {
@ -234,7 +234,7 @@ void NutRenderer::drawChar(byte c, int32 x, int32 y, byte color, bool useMask) {
maskpos++;
}
}
dst += _vm->_realWidth;
dst += _vm->_screenWidth;
mask += _vm->gdi._numStrips;
}