aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2007-09-08 11:15:27 +0000
committerMax Horn2007-09-08 11:15:27 +0000
commit0cccbb29d63a03582b7c3cd89265296a46530414 (patch)
treede32fb80d0d81baa413318201cb56d7281690c9b /engines/scumm/object.cpp
parent89bbbe53ac9adc19bc33e7895ca1eb32f75607fe (diff)
downloadscummvm-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/object.cpp')
-rw-r--r--engines/scumm/object.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index a88c56bc5a..2644a2faf8 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -619,10 +619,10 @@ void ScummEngine::drawObject(int obj, int arg) {
#ifndef DISABLE_HE
if (_game.heversion >= 70 && findResource(MKID_BE('SMAP'), ptr) == NULL)
- _gdi->drawBMAPObject(ptr, &virtscr[0], obj, od.x_pos, od.y_pos, od.width, od.height);
+ _gdi->drawBMAPObject(ptr, &_virtscr[kMainVirtScreen], obj, od.x_pos, od.y_pos, od.width, od.height);
else
#endif
- _gdi->drawBitmap(ptr, &virtscr[0], x, ypos, width * 8, height, x - xpos, numstrip, flags);
+ _gdi->drawBitmap(ptr, &_virtscr[kMainVirtScreen], x, ypos, width * 8, height, x - xpos, numstrip, flags);
}
}
@@ -1626,7 +1626,7 @@ void ScummEngine_v6::drawBlastObject(BlastObject *eo) {
int objnum;
BompDrawData bdd;
- vs = &virtscr[0];
+ vs = &_virtscr[kMainVirtScreen];
assertRange(30, eo->number, _numGlobalObjects - 1, "blast object");
@@ -1704,7 +1704,7 @@ void ScummEngine_v6::removeBlastObjects() {
}
void ScummEngine_v6::removeBlastObject(BlastObject *eo) {
- VirtScreen *vs = &virtscr[0];
+ VirtScreen *vs = &_virtscr[kMainVirtScreen];
Common::Rect r;
int left_strip, right_strip;