aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/object.cpp
diff options
context:
space:
mode:
authorMax Horn2006-09-18 19:22:40 +0000
committerMax Horn2006-09-18 19:22:40 +0000
commit06ddd876a5b1d76641740a0fadd4c1a5e88c3627 (patch)
tree0f17ecb519d400c38c3ce954309f4c1ee6619ae2 /engines/scumm/object.cpp
parentd9f16b8a4ad24fdc6dfc9551cdb929814d26c1b6 (diff)
downloadscummvm-rg350-06ddd876a5b1d76641740a0fadd4c1a5e88c3627.tar.gz
scummvm-rg350-06ddd876a5b1d76641740a0fadd4c1a5e88c3627.tar.bz2
scummvm-rg350-06ddd876a5b1d76641740a0fadd4c1a5e88c3627.zip
Fix --disable-he
svn-id: r23932
Diffstat (limited to 'engines/scumm/object.cpp')
-rw-r--r--engines/scumm/object.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 177996de90..0ab786bbc4 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -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;