libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix --disable-he

Browse Source 
svn-id: r23932
This commit is contained in:
Max Horn 2006-09-18 19:22:40 +00:00
parent d9f16b8a4a
commit 06ddd876a5
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/scumm/gfx.cpp
View File

@ -1711,6 +1711,7 @@ void Gdi::decodeMask(int x, int y, const int width, const int height,
}
}
#ifndef DISABLE_HE
/**
* Draw a bitmap onto a virtual screen. This is main drawing method for room backgrounds
* used throughout HE71+ versions.
@ -1803,7 +1804,6 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs) {
}
void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y, int w, int h) {
#ifndef DISABLE_HE
const byte *bmap_ptr = _vm->findResourceData(MKID_BE('BMAP'), ptr);
assert(bmap_ptr);
@ -1828,7 +1828,6 @@ void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y,
((ScummEngine_v71he *)_vm)->restoreBackgroundHE(rect1);
}
#endif
}
void ScummEngine_v70he::restoreBackgroundHE(Common::Rect rect, int dirtybit) {
@ -1867,6 +1866,7 @@ void ScummEngine_v70he::restoreBackgroundHE(Common::Rect rect, int dirtybit) {
blit(dst, virtscr[0].pitch, src, virtscr[0].pitch, rw, rh);
markRectAsDirty(kMainVirtScreen, rect, dirtybit);
}
#endif
/**
* Reset the background behind an actor or blast object.

3
engines/scumm/gfx.h
View File

@ -285,8 +285,11 @@ public:
void decodeNESGfx(const byte *room);
void decodeNESObject(const byte *ptr, int xpos, int ypos, int width, int height);
#ifndef DISABLE_HE
void drawBMAPBg(const byte *ptr, VirtScreen *vs);
void drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y, int w, int h);
#endif
byte *getMaskBuffer(int x, int y, int z);
void disableZBuffer() { _zbufferDisabled = true; }

6
engines/scumm/object.cpp
View File

@ -474,9 +474,11 @@ void ScummEngine::drawObject(int obj, int arg) {
(_game.id == GID_FT && getClass(od.obj_nr, kObjectClassPlayer)))
flags |= Gdi::dbDrawMaskOnAll;
#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);
else
#endif
_gdi->drawBitmap(ptr, &virtscr[0], x, ypos, width * 8, height, x - xpos, numstrip, flags);
}
}
@ -508,6 +510,7 @@ void ScummEngine::clearRoomObjects() {
}
}
#ifndef DISABLE_HE
void ScummEngine_v70he::resetRoomObjects() {
ScummEngine_v60he::resetRoomObjects();
restoreFlObjects();
@ -553,6 +556,7 @@ void ScummEngine_v70he::restoreFlObjects() {
_numStoredFlObjects = 0;
}
#endif
void ScummEngine::resetRoomObjects() {
int i, j;
@ -1751,6 +1755,7 @@ int ScummEngine::findFlObjectSlot() {
return -1;
}
#ifndef DISABLE_HE
void ScummEngine_v70he::loadFlObject(uint object, uint room) {
// Don't load an already stored object
for (int i = 0; i < _numStoredFlObjects; i++) {
@ -1760,6 +1765,7 @@ void ScummEngine_v70he::loadFlObject(uint object, uint room) {
ScummEngine_v60he::loadFlObject(object, room);
}
#endif
void ScummEngine::loadFlObject(uint object, uint room) {
FindObjectInRoom foir;