[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.17,1.18 sprite_he.h,1.6,1.7
Eugene Sandulenko
sev at users.sourceforge.net
Mon Feb 21 17:25:05 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.16,1.17 intern.h,2.347,2.348 sprite_he.h,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.348,2.349 script_v100he.cpp,2.51,2.52 script_v90he.cpp,2.139,2.140 sprite_he.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16394
Modified Files:
sprite_he.cpp sprite_he.h
Log Message:
Rename script flags as suggested.
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- sprite_he.cpp 22 Feb 2005 01:16:41 -0000 1.17
+++ sprite_he.cpp 22 Feb 2005 01:23:15 -0000 1.18
@@ -257,7 +257,7 @@
if (_spriteTable[spriteId].field_14 != value) {
_spriteTable[spriteId].field_14 = value;
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
}
@@ -266,7 +266,7 @@
if (_spriteTable[spriteId].field_7C != value) {
_spriteTable[spriteId].field_7C = value;
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
}
@@ -288,7 +288,7 @@
if (_spriteTable[spriteId].res_state != state) {
_spriteTable[spriteId].res_state = state;
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
}
}
@@ -299,7 +299,7 @@
if (_spriteTable[spriteId].tx != value1 || _spriteTable[spriteId].ty != value2) {
_spriteTable[spriteId].tx = value1;
_spriteTable[spriteId].ty = value2;
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
}
@@ -322,7 +322,7 @@
_spriteTable[spriteId].field_54 = value;
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_field_44(int spriteId, int value1, int value2) {
@@ -344,7 +344,7 @@
_spriteTable[spriteId].ty += value2;
if (_spriteTable[spriteId].tx || _spriteTable[spriteId].ty)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_zoom(int spriteId, int value) {
@@ -356,7 +356,7 @@
_spriteTable[spriteId].zoom = value;
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
}
@@ -369,7 +369,7 @@
_spriteTable[spriteId].rot_angle = value;
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
}
@@ -391,7 +391,7 @@
_spriteTable[spriteId].flags &= ~(kSF01 | kSF07);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_flagRotated(int spriteId, int value) {
@@ -403,7 +403,7 @@
_spriteTable[spriteId].flags &= ~(kSF01 | kSFRotated);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_flag8(int spriteId, int value) {
@@ -424,7 +424,7 @@
_spriteTable[spriteId].flags &= ~(kSF01 | kSFZoomed);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_flag20(int spriteId, int value) {
@@ -436,16 +436,16 @@
_spriteTable[spriteId].flags &= ~(kSF01 | kSF20);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSF02;
+ _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_flags23_26(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (value)
- _spriteTable[spriteId].flags |= kSF23 | kSF26;
+ _spriteTable[spriteId].flags |= kSF23 | kSFBlitDirectly;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF23 | kSF26);
+ _spriteTable[spriteId].flags &= ~(kSF01 | kSF23 | kSFBlitDirectly);
}
void ScummEngine_v90he::spriteInfoSet_flag31(int spriteId, int value) {
@@ -503,7 +503,7 @@
for (i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (spi->group_num == curGrp) {
- spi->flags |= kSF01 | kSF02;
+ spi->flags |= kSF01 | kSFNeedRedraw;
}
}
}
@@ -513,18 +513,18 @@
for (i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (spi->group_num == curGrp) {
- spi->flags |= kSF01 | kSF02;
+ spi->flags |= kSF01 | kSFNeedRedraw;
}
}
}
spg->flags &= ~kSGF01;
- spriteMarkIfInGroup(curGrp, kSF01 | kSF02);
+ spriteMarkIfInGroup(curGrp, kSF01 | kSFNeedRedraw);
if (spg->field_20 != 0) {
spriteGroupCheck(curGrp);
for (i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (spi->group_num == curGrp) {
- spi->flags |= kSF01 | kSF02;
+ spi->flags |= kSF01 | kSFNeedRedraw;
}
}
}
@@ -568,7 +568,7 @@
if (!(spi->flags & kSF31) && (spi->flags & kSF01)) {
spi->flags &= ~kSF01;
if (spi->bbox_xmin <= spi->bbox_xmax && spi->bbox_ymin <= spi->bbox_ymax) {
- if (spi->flags & kSF26) {
+ if (spi->flags & kSFBlitDirectly) {
gdi.copyVirtScreenBuffers(Common::Rect(spi->bbox_xmin, spi->bbox_ymin, spi->bbox_ymin, spi->bbox_ymax)); // XXX 0, 0x40000000);
}
} else if (firstLoop) {
@@ -592,8 +592,8 @@
}
refreshScreen = true;
}
- if (!(spi->flags & (kSF02 | kSF30)) && (spi->res_id != 0)) {
- spi->flags |= kSF02;
+ if (!(spi->flags & (kSFNeedRedraw | kSF30)) && (spi->res_id != 0)) {
+ spi->flags |= kSFNeedRedraw;
}
}
}
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sprite_he.h 22 Feb 2005 01:16:41 -0000 1.6
+++ sprite_he.h 22 Feb 2005 01:23:15 -0000 1.7
@@ -26,38 +26,38 @@
namespace Scumm {
enum SpriteFlags {
- kSF01 = (1 << 0),
- kSF02 = (1 << 1), // kSFNeedRedraw
- 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),
- kSF13 = (1 << 12),
- kSF14 = (1 << 13),
- kSF15 = (1 << 14),
- kSF16 = (1 << 15),
- kSF17 = (1 << 16),
- kSF18 = (1 << 17),
- kSF19 = (1 << 18),
- kSF20 = (1 << 19),
- kSF21 = (1 << 20),
- kSF22 = (1 << 21),
- kSF23 = (1 << 22),
- kSF24 = (1 << 23),
- kSF25 = (1 << 24),
- kSF26 = (1 << 25), // kSFBlitDirectly
- kSF27 = (1 << 26),
- kSF28 = (1 << 27),
- kSF29 = (1 << 28),
- kSF30 = (1 << 29),
- kSF31 = (1 << 30),
- kSF32 = (1 << 31)
+ kSF01 = (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),
+ kSF13 = (1 << 12),
+ kSF14 = (1 << 13),
+ kSF15 = (1 << 14),
+ kSF16 = (1 << 15),
+ kSF17 = (1 << 16),
+ kSF18 = (1 << 17),
+ kSF19 = (1 << 18),
+ kSF20 = (1 << 19),
+ kSF21 = (1 << 20),
+ kSF22 = (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),
+ kSF31 = (1 << 30),
+ kSF32 = (1 << 31)
};
enum SpriteGroupFlags {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.16,1.17 intern.h,2.347,2.348 sprite_he.h,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.348,2.349 script_v100he.cpp,2.51,2.52 script_v90he.cpp,2.139,2.140 sprite_he.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list