diff options
| author | Max Horn | 2007-09-08 11:15:27 +0000 |
|---|---|---|
| committer | Max Horn | 2007-09-08 11:15:27 +0000 |
| commit | 0cccbb29d63a03582b7c3cd89265296a46530414 (patch) | |
| tree | de32fb80d0d81baa413318201cb56d7281690c9b /engines/scumm/actor.cpp | |
| parent | 89bbbe53ac9adc19bc33e7895ca1eb32f75607fe (diff) | |
| download | scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.tar.gz scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.tar.bz2 scummvm-rg350-0cccbb29d63a03582b7c3cd89265296a46530414.zip | |
Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :)
svn-id: r28877
Diffstat (limited to 'engines/scumm/actor.cpp')
| -rw-r--r-- | engines/scumm/actor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 187a45b836..bf8e85bb99 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -1446,7 +1446,7 @@ void Actor::drawActorCostume(bool hitTestMode) { bcr->_actorX *= V12_X_MULTIPLIER; bcr->_actorY *= V12_Y_MULTIPLIER; } - bcr->_actorX -= _vm->virtscr[0].xstart; + bcr->_actorX -= _vm->_virtscr[kMainVirtScreen].xstart; if (_vm->_game.platform == Common::kPlatformNES) { // In the NES version, when the actor is facing right, @@ -1532,7 +1532,7 @@ void Actor::drawActorCostume(bool hitTestMode) { _heNoTalkAnimation = 0; // If the actor is partially hidden, redraw it next frame. - if (bcr->drawCostume(_vm->virtscr[0], _vm->_gdi->_numStrips, this, _drawToBackBuf) & 1) { + if (bcr->drawCostume(_vm->_virtscr[kMainVirtScreen], _vm->_gdi->_numStrips, this, _drawToBackBuf) & 1) { _needRedraw = (_vm->_game.version <= 6); } @@ -2325,7 +2325,7 @@ void ScummEngine_v71he::postProcessAuxQueue() { int y = (int16)READ_LE_UINT16(axfd + 4) + dy; int w = (int16)READ_LE_UINT16(axfd + 6); int h = (int16)READ_LE_UINT16(axfd + 8); - VirtScreen *pvs = &virtscr[kMainVirtScreen]; + VirtScreen *pvs = &_virtscr[kMainVirtScreen]; uint8 *dst1 = pvs->getPixels(0, pvs->topline); uint8 *dst2 = pvs->getBackPixels(0, pvs->topline); switch (comp) { |