[Scummvm-cvs-logs] SF.net SVN: scummvm: [23932] scummvm/trunk/engines/scumm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Sep 18 21:22:45 CEST 2006
Revision: 23932
http://svn.sourceforge.net/scummvm/?rev=23932&view=rev
Author: fingolfin
Date: 2006-09-18 12:22:40 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
Fix --disable-he
Modified Paths:
--------------
scummvm/trunk/engines/scumm/gfx.cpp
scummvm/trunk/engines/scumm/gfx.h
scummvm/trunk/engines/scumm/object.cpp
Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp 2006-09-18 19:17:55 UTC (rev 23931)
+++ scummvm/trunk/engines/scumm/gfx.cpp 2006-09-18 19:22:40 UTC (rev 23932)
@@ -1711,6 +1711,7 @@
}
}
+#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::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 @@
((ScummEngine_v71he *)_vm)->restoreBackgroundHE(rect1);
}
-#endif
}
void ScummEngine_v70he::restoreBackgroundHE(Common::Rect rect, int dirtybit) {
@@ -1867,6 +1866,7 @@
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.
Modified: scummvm/trunk/engines/scumm/gfx.h
===================================================================
--- scummvm/trunk/engines/scumm/gfx.h 2006-09-18 19:17:55 UTC (rev 23931)
+++ scummvm/trunk/engines/scumm/gfx.h 2006-09-18 19:22:40 UTC (rev 23932)
@@ -285,8 +285,11 @@
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; }
Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp 2006-09-18 19:17:55 UTC (rev 23931)
+++ scummvm/trunk/engines/scumm/object.cpp 2006-09-18 19:22:40 UTC (rev 23932)
@@ -474,9 +474,11 @@
(_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 @@
}
}
+#ifndef DISABLE_HE
void ScummEngine_v70he::resetRoomObjects() {
ScummEngine_v60he::resetRoomObjects();
restoreFlObjects();
@@ -553,6 +556,7 @@
_numStoredFlObjects = 0;
}
+#endif
void ScummEngine::resetRoomObjects() {
int i, j;
@@ -1751,6 +1755,7 @@
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 @@
ScummEngine_v60he::loadFlObject(object, room);
}
+#endif
void ScummEngine::loadFlObject(uint object, uint room) {
FindObjectInRoom foir;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list