[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.128,2.129 script_v80he.cpp,2.39,2.40
Gregory Montoir
cyx at users.sourceforge.net
Sat Sep 25 08:47:32 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31975/scumm
Modified Files:
script_v72he.cpp script_v80he.cpp
Log Message:
get rid of the dirty hack needed to display wiz cursors in HE games
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.128
retrieving revision 2.129
diff -u -d -r2.128 -r2.129
--- script_v72he.cpp 25 Sep 2004 14:03:14 -0000 2.128
+++ script_v72he.cpp 25 Sep 2004 14:17:39 -0000 2.129
@@ -1450,12 +1450,6 @@
if (flags & 0x20) {
int color = 255; // FIXME: should be (VAR_WIZ_TCOLOR != 0xFF) ? VAR(VAR_WIZ_TCOLOR) : 5;
memset(dst, color, width * height);
-
- // FIXME: dirty hack until missing bits are implemented
- Common::Rect rScreen(0, 0, width-1, height-1);
- gdi.copyWizImage(dst, wizd, width, height, 0, 0, width, height, &rScreen);
- setCursorFromBuffer(dst, width, height, width);
- // FIXME: ensure that caller frees the returned pointer
}
cw = width;
ch = height;
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.39
retrieving revision 2.40
diff -u -d -r2.39 -r2.40
--- script_v80he.cpp 22 Sep 2004 05:08:07 -0000 2.39
+++ script_v80he.cpp 25 Sep 2004 14:17:49 -0000 2.40
@@ -592,10 +592,12 @@
rc.top = MIN((int)rc.top, 32);
rc.right = MIN((int)rc.right, 32);
- // FIXME: dirty hack. Cursor is set in drawWizImage, though should be set from here
- // it is unclear how height and width are passed from drawWizImage
- drawWizImage(rtImage, resId, 0, 0, 0, 0x20);
+ uint8 *cursor = drawWizImage(rtImage, resId, 0, 0, 0, 0x20);
+ uint32 cw, ch;
+ getWizImageDim(resId, 0, cw, ch);
+ setCursorFromBuffer(cursor, cw, ch, cw);
setCursorHotspot(rc.top, rc.right);
+ free(cursor);
}
void ScummEngine_v80he::o80_setState() {
More information about the Scummvm-git-logs
mailing list