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

Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :)

Browse source 
svn-id: r28877
This commit is contained in:
Max Horn 2007-09-08 11:15:27 +00:00
parent 89bbbe53ac
commit 0cccbb29d6
26 changed files with 98 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/scumm/object.cpp
View file

@ -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;