[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.392,2.393 script_v100he.cpp,2.87,2.88 script_v90he.cpp,2.182,2.183 sprite_he.cpp,1.98,1.99 sprite_he.h,1.21,1.22
kirben
kirben at users.sourceforge.net
Sun Mar 13 05:00:06 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.248,1.249
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.393,2.394 script_v100he.cpp,2.88,2.89 script_v90he.cpp,2.183,2.184 sprite_he.cpp,1.99,1.100 sprite_he.h,1.22,1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18777/scumm
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
sprite_he.h
Log Message:
Correct sprite flags mistake.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.392
retrieving revision 2.393
diff -u -d -r2.392 -r2.393
--- intern.h 13 Mar 2005 03:23:34 -0000 2.392
+++ intern.h 13 Mar 2005 12:59:25 -0000 2.393
@@ -916,8 +916,8 @@
int spriteInfoGet_flags_15(int spriteId);
int spriteInfoGet_flagActive(int spriteId);
int spriteInfoGet_flags_20(int spriteId);
- int spriteInfoGet_flagYFlipped(int spriteId);
- int spriteInfoGet_flagXFlipped(int spriteId);
+ int spriteInfoGet_flags_22(int spriteId);
+ int spriteInfoGet_flags_23(int spriteId);
int spriteInfoGet_flagHasImage(int spriteId);
int spriteInfoGet_resId(int spriteId);
int spriteInfoGet_resState(int spriteId);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.87
retrieving revision 2.88
diff -u -d -r2.87 -r2.88
--- script_v100he.cpp 13 Mar 2005 03:23:35 -0000 2.87
+++ script_v100he.cpp 13 Mar 2005 12:59:25 -0000 2.88
@@ -2515,7 +2515,7 @@
case 3:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flagYFlipped(spriteId));
+ push(spriteInfoGet_flags_22(spriteId));
else
push(0);
break;
@@ -2700,7 +2700,7 @@
case 82:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flagXFlipped(spriteId));
+ push(spriteInfoGet_flags_23(spriteId));
else
push(0);
break;
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.182
retrieving revision 2.183
diff -u -d -r2.182 -r2.183
--- script_v90he.cpp 12 Mar 2005 23:59:14 -0000 2.182
+++ script_v90he.cpp 13 Mar 2005 12:59:25 -0000 2.183
@@ -915,7 +915,7 @@
case 52:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flagYFlipped(spriteId));
+ push(spriteInfoGet_flags_22(spriteId));
else
push(0);
break;
@@ -950,7 +950,7 @@
case 94:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flagXFlipped(spriteId));
+ push(spriteInfoGet_flags_23(spriteId));
else
push(0);
break;
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- sprite_he.cpp 11 Mar 2005 03:21:43 -0000 1.98
+++ sprite_he.cpp 13 Mar 2005 12:59:25 -0000 1.99
@@ -204,16 +204,16 @@
return ((_spriteTable[spriteId].flags & kSF20) != 0) ? 1 : 0;
}
-int ScummEngine_v90he::spriteInfoGet_flagYFlipped(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flags_22(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return ((_spriteTable[spriteId].flags & kSFYFlipped) != 0) ? 1 : 0;
+ return ((_spriteTable[spriteId].flags & kSF22) != 0) ? 1 : 0;
}
-int ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flags_23(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return ((_spriteTable[spriteId].flags & kSFXFlipped) != 0) ? 1 : 0;
+ return ((_spriteTable[spriteId].flags & kSF23) != 0) ? 1 : 0;
}
int ScummEngine_v90he::spriteInfoGet_flagHasImage(int spriteId) {
@@ -605,18 +605,18 @@
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (value)
- _spriteTable[spriteId].flags |= kSFYFlipped;
+ _spriteTable[spriteId].flags |= kSF22;
else
- _spriteTable[spriteId].flags &= ~(kSFChanged | kSFYFlipped);
+ _spriteTable[spriteId].flags &= ~(kSFChanged | kSF22);
}
void ScummEngine_v90he::spriteInfoSet_flagXFlipped(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (value)
- _spriteTable[spriteId].flags |= kSFXFlipped | kSFBlitDirectly;
+ _spriteTable[spriteId].flags |= kSF23 | kSFBlitDirectly;
else
- _spriteTable[spriteId].flags &= ~(kSFChanged | kSFXFlipped | kSFBlitDirectly);
+ _spriteTable[spriteId].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
}
void ScummEngine_v90he::spriteInfoSet_flagHasImage(int spriteId, int value) {
@@ -712,7 +712,7 @@
if (_spriteTable[spriteId].res_id) {
_spriteTable[spriteId].res_wiz_states = getWizImageStates(_spriteTable[spriteId].res_id);
- _spriteTable[spriteId].flags |= kSFActive | kSFYFlipped | kSFXFlipped | kSFBlitDirectly;
+ _spriteTable[spriteId].flags |= kSFActive | kSF22 | kSF23 | kSFBlitDirectly;
if (_spriteTable[spriteId].res_id != origResId || _spriteTable[spriteId].res_wiz_states != origResWizStates)
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -779,9 +779,9 @@
for (int i = 1; i < _varNumSprites; i++) {
if (_spriteTable[i].group_num == spriteGroupId) {
if (value)
- _spriteTable[i].flags |= kSFXFlipped | kSFBlitDirectly;
+ _spriteTable[i].flags |= kSF23 | kSFBlitDirectly;
else
- _spriteTable[i].flags &= ~(kSFChanged | kSFXFlipped | kSFBlitDirectly);
+ _spriteTable[i].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
}
}
}
@@ -812,9 +812,9 @@
for (int i = 1; i < _varNumSprites; i++) {
if (_spriteTable[i].group_num == spriteGroupId) {
if (value)
- _spriteTable[i].flags |= kSFYFlipped;
+ _spriteTable[i].flags |= kSF22;
else
- _spriteTable[i].flags &= ~(kSFChanged | kSFYFlipped);
+ _spriteTable[i].flags &= ~(kSFChanged | kSF22);
}
}
}
@@ -1043,7 +1043,7 @@
for (int i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (!(spi->flags & (kSFNeedRedraw | kSF30))) {
- if ((!unkFlag || spi->field_18 >= 0) && (spi->flags & kSFXFlipped)) {
+ if ((!unkFlag || spi->field_18 >= 0) && (spi->flags & kSF23)) {
bool needRedraw = false;
int lp = MIN(79, spi->bbox.left / 8);
int rp = MIN(79, (spi->bbox.right + 7) / 8);
@@ -1073,7 +1073,7 @@
spi->flags |= kSFChanged | kSFNeedRedraw;
}
}
- if (spi->flags & kSFYFlipped) {
+ if (spi->flags & kSF22) {
if (spi->field_78) {
--spi->field_64;
if (spi->field_64)
@@ -1118,7 +1118,7 @@
SpriteInfo *spi = &_spriteTable[i];
if (spi->flags & kSFActive) {
- if (!(spi->flags & kSFXFlipped)) {
+ if (!(spi->flags & kSF23)) {
if (!(spi->flags & kSF30))
spi->flags |= kSFNeedRedraw;
if (!(spi->flags & kSFImageless))
@@ -1235,11 +1235,11 @@
}
wiz.img.flags = 0x10;
- if (spr_flags & kSFXFlipped)
+ if (spr_flags & kSF15)
wiz.img.flags |= kWIFFlipX;
- if (spr_flags & kSFYFlipped)
+ if (spr_flags & kSF14)
wiz.img.flags |= kWIFFlipY;
- if (spr_flags & kSF21) {
+ if (spr_flags & kSF13) {
wiz.img.flags &= ~(0x11);
wiz.img.flags |= kWIFBlitToFrontVideoBuffer;
}
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sprite_he.h 7 Mar 2005 11:34:23 -0000 1.21
+++ sprite_he.h 13 Mar 2005 12:59:25 -0000 1.22
@@ -47,8 +47,8 @@
kSF19 = (1 << 18),
kSF20 = (1 << 19),
kSF21 = (1 << 20),
- kSFYFlipped = (1 << 21),
- kSFXFlipped = (1 << 22),
+ kSF22 = (1 << 21),
+ kSF23 = (1 << 22),
kSF24 = (1 << 23),
kSF25 = (1 << 24),
kSFBlitDirectly = (1 << 25),
- Previous message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.248,1.249
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.393,2.394 script_v100he.cpp,2.88,2.89 script_v90he.cpp,2.183,2.184 sprite_he.cpp,1.99,1.100 sprite_he.h,1.22,1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list