[Scummvm-cvs-logs] SF.net SVN: scummvm: [30155] scummvm/branches/branch-0-11-0/engines/scumm/ he/resource_he.cpp
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Jan 2 18:35:11 CET 2008
Revision: 30155
http://scummvm.svn.sourceforge.net/scummvm/?rev=30155&view=rev
Author: sev
Date: 2008-01-02 09:35:11 -0800 (Wed, 02 Jan 2008)
Log Message:
-----------
Backport fix for bug #1846886: "PUTTZOO: Windows version cursor/pointer drawn
wrong"
Modified Paths:
--------------
scummvm/branches/branch-0-11-0/engines/scumm/he/resource_he.cpp
Modified: scummvm/branches/branch-0-11-0/engines/scumm/he/resource_he.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/scumm/he/resource_he.cpp 2008-01-02 17:33:57 UTC (rev 30154)
+++ scummvm/branches/branch-0-11-0/engines/scumm/he/resource_he.cpp 2008-01-02 17:35:11 UTC (rev 30155)
@@ -943,15 +943,19 @@
uint32 x;
uint32 y = (bitmap.height < 0 ? d : height - d - 1);
uint32 imod = y * (image_size / height) * 8 / bitmap.bit_count;
- //uint32 mmod = y * (mask_size / height) * 8;
+ uint32 mmod = y * (mask_size / height) * 8;
for (x = 0; x < width; x++) {
uint32 color = simple_vec(image_data, x + imod, bitmap.bit_count);
// We set up cursor palette for default cursor, so use it
- if (color) {
- cursor[0][width * d + x] = 254; // white
+ if (!simple_vec(mask_data, x + mmod, 1)) {
+ if (color) {
+ cursor[0][width * d + x] = 254; // white
+ } else {
+ cursor[0][width * d + x] = 0; // black
+ }
} else {
cursor[0][width * d + x] = 255; // transparent
}
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