libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 02:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of the dirty hack needed to display wiz cursors in HE games

Browse Source 
svn-id: r15269
This commit is contained in:
Gregory Montoir 2004-09-25 14:17:49 +00:00
parent 554d157c78
commit ac4ca820ee
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scumm/script_v72he.cpp
View File

@ -1450,12 +1450,6 @@ uint8 *ScummEngine_v72he::drawWizImage(int restype, int resnum, int state, int x
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;

8
scumm/script_v80he.cpp
View File

@ -592,10 +592,12 @@ void ScummEngine_v80he::loadWizCursor(int resId, int resType, bool state) {
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() {