[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.369,2.370 script_v100he.cpp,2.67,2.68 script_v90he.cpp,2.162,2.163 sprite_he.cpp,1.68,1.69 sprite_he.h,1.16,1.17
Eugene Sandulenko
sev at users.sourceforge.net
Sat Feb 26 03:07:46 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3773
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
sprite_he.h
Log Message:
Rename HE sprite flag kSF31 -> kSFImageless and corresponding functions.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.369
retrieving revision 2.370
diff -u -d -r2.369 -r2.370
--- intern.h 26 Feb 2005 04:20:46 -0000 2.369
+++ intern.h 26 Feb 2005 11:04:56 -0000 2.370
@@ -885,7 +885,7 @@
int spriteInfoGet_flags_20(int spriteId);
int spriteInfoGet_flagYFlipped(int spriteId);
int spriteInfoGet_flagXFlipped(int spriteId);
- int spriteInfoGet_flags_31(int spriteId);
+ int spriteInfoGet_flagHasImage(int spriteId);
int spriteInfoGet_resId(int spriteId);
int spriteInfoGet_resState(int spriteId);
int spriteInfoGet_groupNum(int spriteId);
@@ -935,7 +935,7 @@
void spriteInfoSet_flag20(int spriteId, int value);
void spriteInfoSet_flagYFlipped(int spriteId, int value);
void spriteInfoSet_flagXFlipped(int spriteId, int value);
- void spriteInfoSet_flag31(int spriteId, int value);
+ void spriteInfoSet_flagHasImage(int spriteId, int value);
void spriteInfoSet_field_78_64(int spriteId, int value);
void spriteInfoSet_setClassFlags(int spriteId, int value);
void spriteInfoSet_setClassFlag(int spriteId, int classId, int toggle);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -d -r2.67 -r2.68
--- script_v100he.cpp 26 Feb 2005 04:20:46 -0000 2.67
+++ script_v100he.cpp 26 Feb 2005 11:04:57 -0000 2.68
@@ -1686,7 +1686,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flag31(spriteId, args[0]);
+ spriteInfoSet_flagHasImage(spriteId, args[0]);
break;
case 38:
args[0] = pop();
@@ -2416,7 +2416,7 @@
case 32:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flags_31(spriteId));
+ push(spriteInfoGet_flagHasImage(spriteId));
else
push(1);
break;
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.162
retrieving revision 2.163
diff -u -d -r2.162 -r2.163
--- script_v90he.cpp 26 Feb 2005 04:20:47 -0000 2.162
+++ script_v90he.cpp 26 Feb 2005 11:04:57 -0000 2.163
@@ -867,7 +867,7 @@
case 38:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_flags_31(spriteId));
+ push(spriteInfoGet_flagHasImage(spriteId));
else
push(1);
break;
@@ -1134,7 +1134,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_flag31(spriteId, args[0]);
+ spriteInfoSet_flagHasImage(spriteId, args[0]);
break;
case 43:
args[1] = pop();
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- sprite_he.cpp 26 Feb 2005 10:59:50 -0000 1.68
+++ sprite_he.cpp 26 Feb 2005 11:05:13 -0000 1.69
@@ -205,10 +205,10 @@
return ((_spriteTable[spriteId].flags & kSFXFlipped) != 0) ? 1 : 0;
}
-int ScummEngine_v90he::spriteInfoGet_flags_31(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagHasImage(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return ((_spriteTable[spriteId].flags & kSF31) != 0) ? 1 : 0;
+ return ((_spriteTable[spriteId].flags & kSFImageless) != 0) ? 1 : 0;
}
int ScummEngine_v90he::spriteInfoGet_resId(int spriteId) {
@@ -604,14 +604,14 @@
_spriteTable[spriteId].flags &= ~(kSFChanged | kSFXFlipped | kSFBlitDirectly);
}
-void ScummEngine_v90he::spriteInfoSet_flag31(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagHasImage(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
// Note that condition is inverted
if (!value)
- _spriteTable[spriteId].flags |= kSF31;
+ _spriteTable[spriteId].flags |= kSFImageless;
else
- _spriteTable[spriteId].flags &= ~(kSFChanged | kSF31);
+ _spriteTable[spriteId].flags &= ~(kSFChanged | kSFImageless);
}
void ScummEngine_v90he::spriteInfoSet_field_78_64(int spriteId, int value) {
@@ -739,7 +739,7 @@
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
} else {
- _spriteTable[spriteId].flags &= ~(kSF31);
+ _spriteTable[spriteId].flags &= ~(kSFImageless);
_spriteTable[spriteId].flags |= kSFChanged | kSFBlitDirectly;
_spriteTable[spriteId].field_4C = 0;
_spriteTable[spriteId].field_48 = 0;
@@ -1080,7 +1080,7 @@
for (int i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
- if (!(spi->flags & kSF31) && (spi->flags & kSFChanged)) {
+ if (!(spi->flags & kSFImageless) && (spi->flags & kSFChanged)) {
spi->flags &= ~kSFChanged;
if (spi->bbox.left <= spi->bbox.right && spi->bbox.top <= spi->bbox.bottom) {
if (spi->flags & kSFBlitDirectly) {
@@ -1219,7 +1219,7 @@
if (!spi->flags & kSFXFlipped) {
if (!(spi->flags & kSF30))
spi->flags |= kSFNeedRedraw;
- if (!(spi->flags & kSF31))
+ if (!(spi->flags & kSFImageless))
spi->flags |= kSFChanged;
}
if (spi->group_num)
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sprite_he.h 26 Feb 2005 10:02:22 -0000 1.16
+++ sprite_he.h 26 Feb 2005 11:05:13 -0000 1.17
@@ -56,7 +56,7 @@
kSF28 = (1 << 27),
kSF29 = (1 << 28),
kSF30 = (1 << 29),
- kSF31 = (1 << 30), // kSFHasImage ?
+ kSFImageless = (1 << 30),
kSF32 = (1 << 31)
};
More information about the Scummvm-git-logs
mailing list