[Scummvm-cvs-logs] CVS: scummvm/sword1 mouse.cpp,1.15,1.16
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Wed Dec 31 07:42:06 CET 2003
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv8228
Modified Files:
mouse.cpp
Log Message:
Draw the luggage first, then the mouse pointer.
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mouse.cpp 30 Dec 2003 21:48:10 -0000 1.15
+++ mouse.cpp 31 Dec 2003 15:41:17 -0000 1.16
@@ -190,20 +190,8 @@
_currentPtr->sizeY = resSizeY;
uint8 *ptrData = (uint8*)_currentPtr + sizeof(MousePtr);
memset(ptrData, 255, resSizeX * resSizeY * noFrames);
- uint8 *dstData = ptrData;
- uint8 *srcData = (uint8*)ptr + sizeof(MousePtr);
- for (uint32 frameCnt = 0; frameCnt < noFrames; frameCnt++) {
- for (uint32 cnty = 0; cnty < FROM_LE_16(ptr->sizeY); cnty++) {
- for (uint32 cntx = 0; cntx < FROM_LE_16(ptr->sizeX); cntx++)
- if (srcData[cntx])
- dstData[cntx] = srcData[cntx];
- srcData += FROM_LE_16(ptr->sizeX);
- dstData += resSizeX;
- }
- dstData += (resSizeY - FROM_LE_16(ptr->sizeY)) * resSizeX;
- }
if (luggageId) {
- dstData = ptrData + resSizeX - FROM_LE_16(lugg->sizeX);
+ uint8 *dstData = ptrData + resSizeX - FROM_LE_16(lugg->sizeX);
for (uint32 frameCnt = 0; frameCnt < noFrames; frameCnt++) {
uint8 *luggSrc = (uint8*)lugg + sizeof(MousePtr);
dstData += (resSizeY - FROM_LE_16(lugg->sizeY)) * resSizeX;
@@ -216,6 +204,18 @@
}
}
_resMan->resClose(luggageId);
+ }
+ uint8 *dstData = ptrData;
+ uint8 *srcData = (uint8*)ptr + sizeof(MousePtr);
+ for (uint32 frameCnt = 0; frameCnt < noFrames; frameCnt++) {
+ for (uint32 cnty = 0; cnty < FROM_LE_16(ptr->sizeY); cnty++) {
+ for (uint32 cntx = 0; cntx < FROM_LE_16(ptr->sizeX); cntx++)
+ if (srcData[cntx])
+ dstData[cntx] = srcData[cntx];
+ srcData += FROM_LE_16(ptr->sizeX);
+ dstData += resSizeX;
+ }
+ dstData += (resSizeY - FROM_LE_16(ptr->sizeY)) * resSizeX;
}
_resMan->resClose(ptrId);
}
More information about the Scummvm-git-logs
mailing list