[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.408,2.409 script_v100he.cpp,2.105,2.106 script_v72he.cpp,2.228,2.229 script_v80he.cpp,2.82,2.83 script_v90he.cpp,2.203,2.204 sprite_he.cpp,1.112,1.113 sprite_he.h,1.28,1.29 wiz_he.cpp,2.32,2.33
kirben
kirben at users.sourceforge.net
Thu Mar 31 22:31:30 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23726/scumm
Modified Files:
intern.h script_v100he.cpp script_v72he.cpp script_v80he.cpp
script_v90he.cpp sprite_he.cpp sprite_he.h wiz_he.cpp
Log Message:
Remove resource type argument in wizImage functions, it is always rtImage.
Rename sprite flags/functions
Remove unused sprite flags
Switch sprite flags back to hex. for easier comparison
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.408
retrieving revision 2.409
diff -u -d -r2.408 -r2.409
--- intern.h 31 Mar 2005 22:51:53 -0000 2.408
+++ intern.h 1 Apr 2005 06:30:44 -0000 2.409
@@ -743,9 +743,9 @@
void displayWizComplexImage(const WizParameters *params);
void drawWizComplexPolygon(int resnum, int state, int po_x, int po_y, int arg14, int angle, int zoom, const Common::Rect *r);
- void captureWizImage(int restype, int resnum, const Common::Rect& r, bool frontBuffer, int compType);
+ void captureWizImage(int resnum, const Common::Rect& r, bool frontBuffer, int compType);
void getWizImageDim(int resnum, int state, int32 &w, int32 &h);
- uint8 *drawWizImage(int restype, const WizImage *pwi);
+ uint8 *drawWizImage(const WizImage *pwi);
void drawWizPolygon(int resnum, int state, int id, int flags);
void flushWizBuffer();
@@ -826,7 +826,7 @@
virtual const char *getOpcodeDesc(byte i);
void loadImgSpot(int resId, int state, int16 &x, int16 &y);
- void loadWizCursor(int resId, int resType, bool state);
+ void loadWizCursor(int resId);
/* HE version 80 script opcodes */
void o80_loadSBNG();
@@ -896,8 +896,8 @@
void fillWizRect(const WizParameters *params);
void processWizImage(const WizParameters *params);
int getWizImageStates(int resnum);
- int isWizPixelNonTransparent(int restype, int resnum, int state, int x, int y, int flags);
- uint8 getWizPixelColor(int restype, int resnum, int state, int x, int y, int flags);
+ int isWizPixelNonTransparent(int resnum, int state, int x, int y, int flags);
+ uint8 getWizPixelColor(int resnum, int state, int x, int y, int flags);
int computeWizHistogram(int resnum, int state, int x, int y, int w, int h);
uint8 *getHEPalette(int palSlot);
@@ -919,7 +919,7 @@
int spriteInfoGet_flagActive(int spriteId);
int spriteInfoGet_flagNeedPaletteRemap(int spriteId);
int spriteInfoGet_flags_22(int spriteId);
- int spriteInfoGet_flags_23(int spriteId);
+ int spriteInfoGet_flagMarkDirty(int spriteId);
int spriteInfoGet_flagHasImage(int spriteId);
int spriteInfoGet_resId(int spriteId);
int spriteInfoGet_resState(int spriteId);
@@ -969,7 +969,7 @@
void spriteInfoSet_flagActive(int spriteId, int value);
void spriteInfoSet_flagNeedPaletteRemap(int spriteId, int value);
void spriteInfoSet_flag22(int spriteId, int value);
- void spriteInfoSet_flag23(int spriteId, int value);
+ void spriteInfoSet_flagMarkDirty(int spriteId, int value);
void spriteInfoSet_flagHasImage(int spriteId, int value);
void spriteInfoSet_delay(int spriteId, int value);
void spriteInfoSet_setClassFlags(int spriteId, int value);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.105
retrieving revision 2.106
diff -u -d -r2.105 -r2.106
--- script_v100he.cpp 31 Mar 2005 22:51:54 -0000 2.105
+++ script_v100he.cpp 1 Apr 2005 06:30:45 -0000 2.106
@@ -2028,7 +2028,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flag23(spriteId, args[0]);
+ spriteInfoSet_flagMarkDirty(spriteId, args[0]);
break;
case 83:
args[1] = pop();
@@ -2118,17 +2118,14 @@
_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
break;
case 0x80:
- a = pop();
- loadWizCursor(a, rtInventory, 0);
- break;
case 0x81:
a = pop();
- loadWizCursor(a, rtInventory, 0);
+ loadWizCursor(a);
break;
case 0x82:
pop();
a = pop();
- loadWizCursor(a, rtInventory, 1);
+ loadWizCursor(a);
break;
case 0x86: // SO_CURSOR_ON Turn cursor on
_cursor.state = 1;
@@ -2362,7 +2359,7 @@
x = pop();
state = pop();
resId = pop();
- push(getWizPixelColor(rtImage, resId, state, x, y, 0));
+ push(getWizPixelColor(resId, state, x, y, 0));
break;
case 6:
resId = pop();
@@ -2373,7 +2370,7 @@
x = pop();
state = pop();
resId = pop();
- push(isWizPixelNonTransparent(rtImage, resId, state, x, y, 0));
+ push(isWizPixelNonTransparent(resId, state, x, y, 0));
break;
case 19:
state = pop();
@@ -2696,7 +2693,7 @@
case 82:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flags_23(spriteId));
+ push(spriteInfoGet_flagMarkDirty(spriteId));
else
push(0);
break;
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.228
retrieving revision 2.229
diff -u -d -r2.228 -r2.229
--- script_v72he.cpp 31 Mar 2005 12:58:10 -0000 2.228
+++ script_v72he.cpp 1 Apr 2005 06:30:45 -0000 2.229
@@ -783,7 +783,7 @@
grab.right = pop() + 1;
grab.top = pop();
grab.left = pop();
- captureWizImage(rtImage, pop(), grab, false, true);
+ captureWizImage(pop(), grab, false, true);
}
void ScummEngine_v72he::o72_getTimer() {
@@ -887,7 +887,7 @@
wi.x1 = wi.y1 = 0;
wi.state = 0;
wi.flags = kWIFPrint;
- drawWizImage(rtImage, &wi);
+ drawWizImage(&wi);
}
void ScummEngine_v72he::o72_getArrayDimSize() {
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.82
retrieving revision 2.83
diff -u -d -r2.82 -r2.83
--- script_v80he.cpp 30 Mar 2005 11:49:53 -0000 2.82
+++ script_v80he.cpp 1 Apr 2005 06:30:45 -0000 2.83
@@ -510,13 +510,10 @@
byte subOp = fetchScriptByte();
switch (subOp) {
- case 0x13: // Loads cursors from another resource
- a = pop();
- loadWizCursor(a, rtInventory, 0);
- break;
+ case 0x13:
case 0x14:
a = pop();
- loadWizCursor(a, rtInventory, 1);
+ loadWizCursor(a);
break;
case 0x90: // SO_CURSOR_ON Turn cursor on
_cursor.state = 1;
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.203
retrieving revision 2.204
diff -u -d -r2.203 -r2.204
--- script_v90he.cpp 31 Mar 2005 22:51:54 -0000 2.203
+++ script_v90he.cpp 1 Apr 2005 06:30:45 -0000 2.204
@@ -951,7 +951,7 @@
case 94:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flags_23(spriteId));
+ push(spriteInfoGet_flagMarkDirty(spriteId));
else
push(0);
break;
@@ -1248,7 +1248,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flag23(spriteId, args[0]);
+ spriteInfoSet_flagMarkDirty(spriteId, args[0]);
break;
case 91:
n = getStackList(args, ARRAYSIZE(args));
@@ -1604,14 +1604,14 @@
x = pop();
state = pop();
resId = pop();
- push(isWizPixelNonTransparent(rtImage, resId, state, x, y, 0));
+ push(isWizPixelNonTransparent(resId, state, x, y, 0));
break;
case 36:
y = pop();
x = pop();
state = pop();
resId = pop();
- push(getWizPixelColor(rtImage, resId, state, x, y, 0));
+ push(getWizPixelColor(resId, state, x, y, 0));
break;
case 100:
h = pop();
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- sprite_he.cpp 31 Mar 2005 22:51:54 -0000 1.112
+++ sprite_he.cpp 1 Apr 2005 06:30:46 -0000 1.113
@@ -200,7 +200,7 @@
y += h / 2;
}
- if(isWizPixelNonTransparent(rtImage, resId, state, x, y, spi->imgFlags))
+ if(isWizPixelNonTransparent(resId, state, x, y, spi->imgFlags))
return spi->id;
}
}
@@ -267,10 +267,10 @@
return ((_spriteTable[spriteId].flags & kSFDelayed) != 0) ? 1 : 0;
}
-int ScummEngine_v90he::spriteInfoGet_flags_23(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagMarkDirty(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return ((_spriteTable[spriteId].flags & kSF23) != 0) ? 1 : 0;
+ return ((_spriteTable[spriteId].flags & kSFMarkDirty) != 0) ? 1 : 0;
}
int ScummEngine_v90he::spriteInfoGet_flagHasImage(int spriteId) {
@@ -667,13 +667,13 @@
_spriteTable[spriteId].flags &= ~kSFDelayed;
}
-void ScummEngine_v90he::spriteInfoSet_flag23(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagMarkDirty(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (value)
- _spriteTable[spriteId].flags |= kSF23 | kSFBlitDirectly;
+ _spriteTable[spriteId].flags |= kSFMarkDirty | kSFBlitDirectly;
else
- _spriteTable[spriteId].flags &= ~(kSF23 | kSFBlitDirectly);
+ _spriteTable[spriteId].flags &= ~(kSFMarkDirty | kSFBlitDirectly);
}
void ScummEngine_v90he::spriteInfoSet_flagHasImage(int spriteId, int value) {
@@ -768,7 +768,7 @@
if (_spriteTable[spriteId].res_id) {
_spriteTable[spriteId].res_wiz_states = getWizImageStates(_spriteTable[spriteId].res_id);
- _spriteTable[spriteId].flags |= kSFActive | kSFDelayed | kSF23 | kSFBlitDirectly;
+ _spriteTable[spriteId].flags |= kSFActive | kSFDelayed | kSFMarkDirty | kSFBlitDirectly;
if (_spriteTable[spriteId].res_id != origResId || _spriteTable[spriteId].res_wiz_states != origResWizStates)
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -835,9 +835,9 @@
for (int i = 1; i < _varNumSprites; i++) {
if (_spriteTable[i].group_num == spriteGroupId) {
if (value)
- _spriteTable[i].flags |= kSF23 | kSFBlitDirectly;
+ _spriteTable[i].flags |= kSFMarkDirty | kSFBlitDirectly;
else
- _spriteTable[i].flags &= ~(kSF23 | kSFBlitDirectly);
+ _spriteTable[i].flags &= ~(kSFMarkDirty | kSFBlitDirectly);
}
}
}
@@ -1099,7 +1099,7 @@
for (int i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (!(spi->flags & (kSFNeedRedraw | kSF30))) {
- if ((!unkFlag || spi->zorderPriority >= 0) && (spi->flags & kSF23)) {
+ if ((!unkFlag || spi->zorderPriority >= 0) && (spi->flags & kSFMarkDirty)) {
bool needRedraw = false;
int lp = MIN(79, spi->bbox.left / 8);
int rp = MIN(79, (spi->bbox.right + 7) / 8);
@@ -1174,7 +1174,7 @@
SpriteInfo *spi = &_spriteTable[i];
if (spi->flags & kSFActive) {
- if (!(spi->flags & kSF23)) {
+ if (!(spi->flags & kSFMarkDirty)) {
if (!(spi->flags & kSF30))
spi->flags |= kSFNeedRedraw;
if (!(spi->flags & kSFImageless))
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sprite_he.h 31 Mar 2005 22:51:54 -0000 1.28
+++ sprite_he.h 1 Apr 2005 06:30:46 -0000 1.29
@@ -26,38 +26,20 @@
namespace Scumm {
enum SpriteFlags {
- kSFChanged = (1 << 0),
- kSFNeedRedraw = (1 << 1),
- kSF03 = (1 << 2),
- kSF04 = (1 << 3),
- kSFZoomed = (1 << 4),
- kSFRotated = (1 << 5),
- kSF07 = (1 << 6),
- kSF08 = (1 << 7),
- kSF09 = (1 << 8),
- kSF10 = (1 << 9),
- kSF11 = (1 << 10),
- kSF12 = (1 << 11),
- kSFDoubleBuffered = (1 << 12),
- kSFYFlipped = (1 << 13),
- kSFXFlipped = (1 << 14),
- kSFActive = (1 << 15),
- kSF17 = (1 << 16),
- kSF18 = (1 << 17),
- kSF19 = (1 << 18),
- kSFNeedPaletteRemap = (1 << 19),
- kSF21 = (1 << 20),
- kSFDelayed = (1 << 21),
- kSF23 = (1 << 22),
- kSF24 = (1 << 23),
- kSF25 = (1 << 24),
- kSFBlitDirectly = (1 << 25),
- kSF27 = (1 << 26),
- kSF28 = (1 << 27),
- kSF29 = (1 << 28),
- kSF30 = (1 << 29),
- kSFImageless = (1 << 30),
- kSF32 = (1 << 31)
+ kSFChanged = 0x1,
+ kSFNeedRedraw = 0x2,
+ kSFZoomed = 0x10,
+ kSFRotated = 0x20,
+ kSFDoubleBuffered = 0x1000,
+ kSFYFlipped = 0x2000,
+ kSFXFlipped = 0x4000,
+ kSFActive = 0x8000,
+ kSFNeedPaletteRemap = 0x80000,
+ kSFDelayed = 0x200000,
+ kSFMarkDirty = 0x400000,
+ kSFBlitDirectly = 0x2000000,
+ kSF30 = 0x20000000,
+ kSFImageless = 0x40000000
};
enum SpriteGroupFlags {
Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- wiz_he.cpp 31 Mar 2005 22:51:54 -0000 2.32
+++ wiz_he.cpp 1 Apr 2005 06:30:46 -0000 2.33
@@ -773,8 +773,8 @@
return size;
}
-void ScummEngine_v72he::captureWizImage(int resType, int resNum, const Common::Rect& r, bool frontBuffer, int compType) {
- debug(1, "ScummEngine_v72he::captureWizImage(%d, %d, %d, [%d,%d,%d,%d])", resType, resNum, compType, r.left, r.top, r.right, r.bottom);
+void ScummEngine_v72he::captureWizImage(int resNum, const Common::Rect& r, bool frontBuffer, int compType) {
+ debug(1, "ScummEngine_v72he::captureWizImage(%d, %d, [%d,%d,%d,%d])", resNum, compType, r.left, r.top, r.right, r.bottom);
uint8 *src = NULL;
VirtScreen *pvs = &virtscr[kMainVirtScreen];
if (frontBuffer) {
@@ -810,7 +810,7 @@
dataSize = (dataSize + 1) & ~1;
int wizSize = headerSize + dataSize;
// write header
- uint8 *wizImg = createResource(resType, resNum, dataSize + headerSize);
+ uint8 *wizImg = createResource(rtImage, resNum, dataSize + headerSize);
*(uint32 *)(wizImg + 0x00) = MKID('AWIZ');
*(uint32 *)(wizImg + 0x04) = TO_BE_32(wizSize);
*(uint32 *)(wizImg + 0x08) = MKID('WIZH');
@@ -859,10 +859,10 @@
h = READ_LE_UINT32(wizh + 0x8);
}
-uint8 *ScummEngine_v72he::drawWizImage(int restype, const WizImage *pwi) {
- debug(1, "drawWizImage(%d, %d, %d, %d, 0x%X)", restype, pwi->resNum, pwi->x1, pwi->y1, pwi->flags);
+uint8 *ScummEngine_v72he::drawWizImage(const WizImage *pwi) {
+ debug(1, "drawWizImage(%d, %d, %d, 0x%X)", pwi->resNum, pwi->x1, pwi->y1, pwi->flags);
uint8 *dst = NULL;
- uint8 *dataPtr = getResourceAddress(restype, pwi->resNum);
+ uint8 *dataPtr = getResourceAddress(rtImage, pwi->resNum);
if (dataPtr) {
uint8 *rmap = NULL;
uint8 *xmap = findWrappedBlock(MKID('XMAP'), dataPtr, pwi->state, 0);
@@ -1046,7 +1046,7 @@
wi.state = state;
wi.x1 = wi.y1 = 0;
wi.flags = kWIFBlitToMemBuffer;
- uint8 *srcWizBuf = drawWizImage(rtImage, &wi);
+ uint8 *srcWizBuf = drawWizImage(&wi);
if (srcWizBuf) {
uint8 *dst;
VirtScreen *pvs = &virtscr[kMainVirtScreen];
@@ -1131,7 +1131,7 @@
if (pwi->flags & kWIFIsPolygon) {
drawWizPolygon(pwi->resNum, pwi->state, pwi->x1, pwi->flags);
} else {
- drawWizImage(rtImage, pwi);
+ drawWizImage(pwi);
}
}
_wiz._imagesNum = 0;
@@ -1150,7 +1150,7 @@
}
}
-void ScummEngine_v80he::loadWizCursor(int resId, int resType, bool state) {
+void ScummEngine_v80he::loadWizCursor(int resId) {
int16 x, y;
loadImgSpot(resId, 0, x, y);
if (x < 0) {
@@ -1169,7 +1169,7 @@
wi.x1 = wi.y1 = 0;
wi.state = 0;
wi.flags = kWIFBlitToMemBuffer;
- uint8 *cursor = drawWizImage(rtImage, &wi);
+ uint8 *cursor = drawWizImage(&wi);
int32 cw, ch;
getWizImageDim(resId, 0, cw, ch);
setCursorFromBuffer(cursor, cw, ch, cw);
@@ -1288,7 +1288,7 @@
wi.flags = flags;
wi.unk = unk;
wi.paletteNum = paletteNum;
- drawWizImage(rtImage, &wi);
+ drawWizImage(&wi);
}
}
@@ -1408,7 +1408,7 @@
displayWizComplexImage(params);
break;
case 2:
- captureWizImage(rtImage, params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) == kWIFBlitToFrontVideoBuffer, params->compType);
+ captureWizImage(params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) == kWIFBlitToFrontVideoBuffer, params->compType);
break;
case 3:
if (params->processFlags & kWPFUseFile) {
@@ -1528,9 +1528,9 @@
}
}
-int ScummEngine_v90he::isWizPixelNonTransparent(int restype, int resnum, int state, int x, int y, int flags) {
+int ScummEngine_v90he::isWizPixelNonTransparent(int resnum, int state, int x, int y, int flags) {
int ret = 0;
- uint8 *data = getResourceAddress(restype, resnum);
+ uint8 *data = getResourceAddress(rtImage, resnum);
assert(data);
uint8 *wizh = findWrappedBlock(MKID('WIZH'), data, state, 0);
assert(wizh);
@@ -1555,9 +1555,9 @@
return ret;
}
-uint8 ScummEngine_v90he::getWizPixelColor(int restype, int resnum, int state, int x, int y, int flags) {
+uint8 ScummEngine_v90he::getWizPixelColor(int resnum, int state, int x, int y, int flags) {
uint8 color;
- uint8 *data = getResourceAddress(restype, resnum);
+ uint8 *data = getResourceAddress(rtImage, resnum);
assert(data);
uint8 *wizh = findWrappedBlock(MKID('WIZH'), data, state, 0);
assert(wizh);
More information about the Scummvm-git-logs
mailing list