[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.h,2.9,2.10 wiz_he.cpp,2.21,2.22 sprite_he.h,1.25,1.26 sprite_he.cpp,1.104,1.105
Gregory Montoir
cyx at users.sourceforge.net
Wed Mar 23 13:57:22 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: web/docs bootparam.xml,1.20,1.21
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.130,2.131 costume.cpp,1.165,1.166 cursor.cpp,2.31,2.32 gfx.cpp,2.412,2.413 palette.cpp,2.28,2.29 script_v2.cpp,2.263,2.264 scumm.cpp,1.378,1.379 scumm.h,1.544,1.545
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1192
Modified Files:
wiz_he.h wiz_he.cpp sprite_he.h sprite_he.cpp
Log Message:
some wiz flags renaming
Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- wiz_he.h 9 Mar 2005 05:04:14 -0000 2.9
+++ wiz_he.h 23 Mar 2005 21:55:07 -0000 2.10
@@ -78,8 +78,11 @@
};
enum WizImageFlags {
+ kWIFHasPalette = 0x1,
+ kWIFRemapPalette = 0x2,
kWIFPrint = 0x4,
kWIFBlitToFrontVideoBuffer = 0x8,
+ kWIFMarkBufferDirty = 0x10,
kWIFBlitToMemBuffer = 0x20,
kWIFIsPolygon = 0x40,
kWIFFlipX = 0x400,
@@ -91,11 +94,14 @@
kWPFZoom = 0x8,
kWPFRotate = 0x10,
kWPFNewFlags = 0x20,
+ kWPFRemapPalette = 0x40,
kWPFClipBox = 0x200,
kWPFNewState = 0x400,
kWPFUseFile = 0x800,
kWPFUseDefImgWidth = 0x2000,
- kWPFUseDefImgHeight = 0x4000
+ kWPFUseDefImgHeight = 0x4000,
+ kWPFFillColor = 0x20000,
+ kWPFClipBox2 = 0x40000
};
struct Wiz {
Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- wiz_he.cpp 10 Mar 2005 11:40:07 -0000 2.21
+++ wiz_he.cpp 23 Mar 2005 21:55:10 -0000 2.22
@@ -867,12 +867,12 @@
uint8 *wizd = findWrappedBlock(MKID('WIZD'), dataPtr, pwi->state, 0);
assert(wizd);
- if (pwi->flags & 1) {
+ if (pwi->flags & kWIFHasPalette) {
uint8 *pal = findWrappedBlock(MKID('RGBS'), dataPtr, pwi->state, 0);
assert(pal);
setPaletteFromPtr(pal, 256);
}
- if (pwi->flags & 2) {
+ if (pwi->flags & kWIFRemapPalette) {
rmap = findWrappedBlock(MKID('RMAP'), dataPtr, pwi->state, 0);
assert(rmap);
uint8 *rgbs = findWrappedBlock(MKID('RGBS'), dataPtr, pwi->state, 0);
@@ -893,7 +893,7 @@
ch = height;
} else {
VirtScreen *pvs = &virtscr[kMainVirtScreen];
- if (pwi->flags & 0x10) {
+ if (pwi->flags & kWIFMarkBufferDirty) {
dst = pvs->getPixels(0, pvs->topline);
} else {
dst = pvs->getBackPixels(0, pvs->topline);
@@ -915,7 +915,7 @@
uint8 *trns = findWrappedBlock(MKID('TRNS'), dataPtr, pwi->state, 0);
int color = (trns == NULL) ? VAR(VAR_WIZ_TCOLOR) : -1;
const uint8 *pal = xmap;
- if (pwi->flags & 2) {
+ if (pwi->flags & kWIFRemapPalette) {
pal = rmap + 4;
}
_wiz.copyRawWizImage(dst, wizd, cw, ch, pwi->x1, pwi->y1, width, height, &rScreen, pwi->flags, pal, color);
@@ -927,7 +927,7 @@
Common::Rect rImage(pwi->x1, pwi->y1, pwi->x1 + width, pwi->y1 + height);
if (rImage.intersects(rScreen)) {
rImage.clip(rScreen);
- if (!(pwi->flags & kWIFBlitToFrontVideoBuffer) && pwi->flags & 0x18) {
+ if (!(pwi->flags & kWIFBlitToFrontVideoBuffer) && (pwi->flags & (kWIFBlitToFrontVideoBuffer | kWIFMarkBufferDirty))) {
++rImage.bottom;
markRectAsDirty(kMainVirtScreen, rImage);
} else {
@@ -1024,12 +1024,12 @@
wi.resNum = resnum;
wi.state = state;
wi.x1 = wi.y1 = 0;
- wi.flags = 0x20;
+ wi.flags = kWIFBlitToMemBuffer;
uint8 *srcWizBuf = drawWizImage(rtImage, &wi);
if (srcWizBuf) {
uint8 *dst;
VirtScreen *pvs = &virtscr[kMainVirtScreen];
- if (flags & 0x10) {
+ if (flags & kWIFMarkBufferDirty) {
dst = pvs->getPixels(0, 0);
} else {
dst = pvs->getBackPixels(0, 0);
@@ -1094,7 +1094,7 @@
yoff += pvs->pitch;
}
- if (flags & 0x10) {
+ if (flags & kWIFMarkBufferDirty) {
markRectAsDirty(kMainVirtScreen, wp->bound);
} else {
gdi.copyVirtScreenBuffers(wp->bound);
@@ -1107,7 +1107,7 @@
void ScummEngine_v72he::flushWizBuffer() {
for (int i = 0; i < _wiz._imagesNum; ++i) {
WizImage *pwi = &_wiz._images[i];
- if (pwi->flags & 0x40) {
+ if (pwi->flags & kWIFIsPolygon) {
drawWizPolygon(pwi->resNum, pwi->state, pwi->x1, pwi->flags);
} else {
drawWizImage(rtImage, pwi);
@@ -1147,7 +1147,7 @@
wi.resNum = resId;
wi.x1 = wi.y1 = 0;
wi.state = 0;
- wi.flags = 0x20;
+ wi.flags = kWIFBlitToMemBuffer;
uint8 *cursor = drawWizImage(rtImage, &wi);
int32 cw, ch;
getWizImageDim(resId, 0, cw, ch);
@@ -1224,8 +1224,8 @@
warning("displayWizComplexImage() unhandled flags = 0x10000");
}
- if (params->processFlags & 0x40) {
- int st = (params->processFlags & 0x400) ? params->img.state : 0;
+ if (params->processFlags & kWPFRemapPalette) {
+ int st = (params->processFlags & kWPFNewState) ? params->img.state : 0;
int num = params->remapNum;
const uint8 *index = params->remapIndex;
uint8 *iwiz = getResourceAddress(rtImage, params->img.resNum);
@@ -1249,7 +1249,7 @@
pwi->flags = flags;
pwi->unk = unk;
++_wiz._imagesNum;
- } else if (params->processFlags & 0x18) {
+ } else if (params->processFlags & (kWPFRotate | kWPFZoom)) {
drawWizComplexPolygon(params->img.resNum, state, po_x, po_y, unk, rotationAngle, zoom, r);
} else if (flags & kWIFIsPolygon) {
drawWizPolygon(params->img.resNum, state, po_x, flags); // XXX , VAR(VAR_WIZ_TCOLOR));
@@ -1354,11 +1354,11 @@
}
r1.clip(params->box);
}
- if (params->processFlags & 0x40000) {
+ if (params->processFlags & kWPFClipBox2) {
r1.clip(params->box2);
}
uint8 color;
- if (params->processFlags & 0x20000) {
+ if (params->processFlags & kWPFFillColor) {
color = params->fillColor;
} else {
color = VAR(93);
@@ -1433,8 +1433,8 @@
}
break;
case 6:
- if (params->processFlags & 0x40) {
- int state = (params->processFlags & 0x400) ? params->img.state : 0;
+ if (params->processFlags & kWPFRemapPalette) {
+ int state = (params->processFlags & kWPFNewState) ? params->img.state : 0;
int num = params->remapNum;
const uint8 *index = params->remapIndex;
uint8 *iwiz = getResourceAddress(rtImage, params->img.resNum);
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sprite_he.h 17 Mar 2005 09:28:36 -0000 1.25
+++ sprite_he.h 23 Mar 2005 21:55:11 -0000 1.26
@@ -38,16 +38,16 @@
kSF10 = (1 << 9),
kSF11 = (1 << 10),
kSF12 = (1 << 11),
- kSF13 = (1 << 12),
+ kSF13 = (1 << 12), // kSFDoubleBuffered
kSFYFlipped = (1 << 13),
kSFXFlipped = (1 << 14),
kSFActive = (1 << 15),
kSF17 = (1 << 16),
kSF18 = (1 << 17),
kSF19 = (1 << 18),
- kSF20 = (1 << 19),
+ kSF20 = (1 << 19), // kSFNeedPaletteRemap
kSF21 = (1 << 20),
- kSF22 = (1 << 21),
+ kSF22 = (1 << 21), // kSFDelayed
kSF23 = (1 << 22),
kSF24 = (1 << 23),
kSF25 = (1 << 24),
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- sprite_he.cpp 17 Mar 2005 09:42:31 -0000 1.104
+++ sprite_he.cpp 23 Mar 2005 21:55:11 -0000 1.105
@@ -1233,13 +1233,13 @@
bboxPtr->bottom = -1234;
}
- wiz.img.flags = 0x10;
+ wiz.img.flags = kWIFMarkBufferDirty;
if (spr_flags & kSFXFlipped)
wiz.img.flags |= kWIFFlipX;
if (spr_flags & kSFYFlipped)
wiz.img.flags |= kWIFFlipY;
if (spr_flags & kSF13) {
- wiz.img.flags &= ~(0x10);
+ wiz.img.flags &= ~kWIFMarkBufferDirty;
wiz.img.flags |= kWIFBlitToFrontVideoBuffer;
}
if (spi->field_54) {
@@ -1248,7 +1248,7 @@
wiz.unk_15C = spi->field_54;
}
if (spr_flags & kSF20)
- wiz.img.flags |= 2;
+ wiz.img.flags |= kWIFRemapPalette;
if (spi->field_7C) {
wiz.processFlags |= 0x80000;
wiz.unk_178 = spi->field_7C;
- Previous message: [Scummvm-cvs-logs] CVS: web/docs bootparam.xml,1.20,1.21
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.130,2.131 costume.cpp,1.165,1.166 cursor.cpp,2.31,2.32 gfx.cpp,2.412,2.413 palette.cpp,2.28,2.29 script_v2.cpp,2.263,2.264 scumm.cpp,1.378,1.379 scumm.h,1.544,1.545
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list