[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.364,2.365 script_v100he.cpp,2.61,2.62 script_v90he.cpp,2.156,2.157 sprite_he.cpp,1.48,1.49 sprite_he.h,1.12,1.13
Eugene Sandulenko
sev at users.sourceforge.net
Thu Feb 24 13:07:03 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.205,2.206 script_v80he.cpp,2.75,2.76 script_v90he.cpp,2.155,2.156 sprite_he.cpp,1.47,1.48 sprite_he.h,1.11,1.12 wiz_he.cpp,2.3,2.4 wiz_he.h,2.3,2.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.365,2.366 script_v100he.cpp,2.62,2.63 script_v90he.cpp,2.157,2.158 sprite_he.cpp,1.49,1.50 sprite_he.h,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22091
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
sprite_he.h
Log Message:
o Fixed sprite flags everywhere. In many cases they were wrong as they were
checked in higher byte not whole word.
o Some flags/functions renames
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.364
retrieving revision 2.365
diff -u -d -r2.364 -r2.365
--- intern.h 24 Feb 2005 08:00:24 -0000 2.364
+++ intern.h 24 Feb 2005 21:05:28 -0000 2.365
@@ -881,7 +881,7 @@
int spriteInfoGet_flags_13(int spriteId);
int spriteInfoGet_flags_14(int spriteId);
int spriteInfoGet_flags_15(int spriteId);
- int spriteInfoGet_flags_16(int spriteId);
+ int spriteInfoGet_flagActive(int spriteId);
int spriteInfoGet_flags_20(int spriteId);
int spriteInfoGet_flags_22(int spriteId);
int spriteInfoGet_flags_23(int spriteId);
@@ -931,7 +931,7 @@
void spriteInfoSet_flag13(int spriteId, int value);
void spriteInfoSet_flag14(int spriteId, int value);
void spriteInfoSet_flag15(int spriteId, int value);
- void spriteInfoSet_flag16(int spriteId, int value);
+ void spriteInfoSet_flagActive(int spriteId, int value);
void spriteInfoSet_flag20(int spriteId, int value);
void spriteInfoSet_flag22(int spriteId, int value);
void spriteInfoSet_flags23_26(int spriteId, int value);
@@ -967,7 +967,7 @@
void spritesResetTables(bool refreshScreen);
void spriteGroupCheck(int spriteGroupId);
void spriteMarkIfInGroup(int spriteGroupId, uint32 flags);
- void spriteInfoSet_addImageToList(int spriteId, int imageNum, int *spriteIdptr);
+ void spriteAddImageToList(int spriteId, int imageNum, int *spriteIdptr);
public:
void spritesBlitToScreen();
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.61
retrieving revision 2.62
diff -u -d -r2.61 -r2.62
--- script_v100he.cpp 24 Feb 2005 06:47:12 -0000 2.61
+++ script_v100he.cpp 24 Feb 2005 21:05:28 -0000 2.62
@@ -1707,7 +1707,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_addImageToList(spriteId, 1, &args[0]);
+ spriteAddImageToList(spriteId, 1, &args[0]);
break;
case 48:
args[0] = pop();
@@ -1790,7 +1790,7 @@
spriteInfoSet_flag14(spriteId, args[0]);
break;
case 2:
- spriteInfoSet_flag16(spriteId, args[0]);
+ spriteInfoSet_flagActive(spriteId, args[0]);
break;
case 3:
spriteInfoSet_flag13(spriteId, args[0]);
@@ -2489,7 +2489,7 @@
push(spriteInfoGet_flags_14(spriteId));
break;
case 2:
- push(spriteInfoGet_flags_16(spriteId));
+ push(spriteInfoGet_flagActive(spriteId));
break;
case 3:
push(spriteInfoGet_flags_13(spriteId));
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.156
retrieving revision 2.157
diff -u -d -r2.156 -r2.157
--- script_v90he.cpp 24 Feb 2005 20:20:35 -0000 2.156
+++ script_v90he.cpp 24 Feb 2005 21:05:28 -0000 2.157
@@ -800,7 +800,7 @@
push(spriteInfoGet_flags_14(spriteId));
break;
case 2:
- push(spriteInfoGet_flags_16(spriteId));
+ push(spriteInfoGet_flagActive(spriteId));
break;
case 3:
push(spriteInfoGet_flags_13(spriteId));
@@ -1021,7 +1021,7 @@
spriteInfoSet_flag14(spriteId, args[0]);
break;
case 2:
- spriteInfoSet_flag16(spriteId, args[0]);
+ spriteInfoSet_flagActive(spriteId, args[0]);
break;
case 3:
spriteInfoSet_flag13(spriteId, args[0]);
@@ -1110,7 +1110,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_addImageToList(spriteId, 1, &args[0]);
+ spriteAddImageToList(spriteId, 1, &args[0]);
break;
case 31:
args[1] = pop();
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sprite_he.cpp 24 Feb 2005 20:20:35 -0000 1.48
+++ sprite_he.cpp 24 Feb 2005 21:05:29 -0000 1.49
@@ -90,10 +90,10 @@
return ((_spriteTable[spriteId].flags & kSF15) != 0) ? 1 : 0;
}
-int ScummEngine_v90he::spriteInfoGet_flags_16(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagActive(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return ((_spriteTable[spriteId].flags & kSF16) != 0) ? 1 : 0;
+ return ((_spriteTable[spriteId].flags & kSFActive) != 0) ? 1 : 0;
}
int ScummEngine_v90he::spriteInfoGet_flags_20(int spriteId) {
@@ -318,7 +318,7 @@
if (_spriteTable[spriteId].field_14 != value) {
_spriteTable[spriteId].field_14 = value;
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
@@ -327,7 +327,7 @@
if (_spriteTable[spriteId].field_7C != value) {
_spriteTable[spriteId].field_7C = value;
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
@@ -349,7 +349,7 @@
if (_spriteTable[spriteId].res_state != state) {
_spriteTable[spriteId].res_state = state;
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -360,7 +360,7 @@
if (_spriteTable[spriteId].tx != value1 || _spriteTable[spriteId].ty != value2) {
_spriteTable[spriteId].tx = value1;
_spriteTable[spriteId].ty = value2;
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
@@ -369,7 +369,7 @@
checkRange(_varNumSpriteGroups, 0, value, "Invalid sprite group %d");
_spriteTable[spriteId].group_num = value;
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_dx_dy(int spriteId, int value1, int value2) {
@@ -384,7 +384,7 @@
_spriteTable[spriteId].field_54 = value;
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_field_44(int spriteId, int value1, int value2) {
@@ -406,7 +406,7 @@
_spriteTable[spriteId].ty += value2;
if (value1 || value2)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_zoom(int spriteId, int value) {
@@ -418,7 +418,7 @@
_spriteTable[spriteId].zoom = value;
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
@@ -431,7 +431,7 @@
_spriteTable[spriteId].rot_angle = value;
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
@@ -441,10 +441,10 @@
if (value)
_spriteTable[spriteId].flags |= kSF13;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF13);
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSF13);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_flag14(int spriteId, int value) {
@@ -453,10 +453,10 @@
if (value)
_spriteTable[spriteId].flags |= kSF14;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF14);
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSF14);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_flag15(int spriteId, int value) {
@@ -465,19 +465,19 @@
if (value)
_spriteTable[spriteId].flags |= kSF15;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF15);
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSF15);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
-void ScummEngine_v90he::spriteInfoSet_flag16(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagActive(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (value)
- _spriteTable[spriteId].flags |= kSF16;
+ _spriteTable[spriteId].flags |= kSFActive;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF16);
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSFActive);
}
void ScummEngine_v90he::spriteInfoSet_flag20(int spriteId, int value) {
@@ -486,10 +486,10 @@
if (value)
_spriteTable[spriteId].flags |= kSF20;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF20);
+ _spriteTable[spriteId].flags &= ~(kSFChanged | kSF20);
if (_spriteTable[spriteId].res_id)
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
void ScummEngine_v90he::spriteInfoSet_flag22(int spriteId, int value) {
@@ -498,7 +498,7 @@
if (value)
_spriteTable[spriteId].flags |= kSF22;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF22);
+ _spriteTable[spriteId].flags &= ~(kSFChanged | kSF22);
}
void ScummEngine_v90he::spriteInfoSet_flags23_26(int spriteId, int value) {
@@ -507,7 +507,7 @@
if (value)
_spriteTable[spriteId].flags |= kSF23 | kSFBlitDirectly;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF23 | kSFBlitDirectly);
+ _spriteTable[spriteId].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
}
void ScummEngine_v90he::spriteInfoSet_flag31(int spriteId, int value) {
@@ -517,7 +517,7 @@
if (!value)
_spriteTable[spriteId].flags |= kSF31;
else
- _spriteTable[spriteId].flags &= ~(kSF01 | kSF31);
+ _spriteTable[spriteId].flags &= ~(kSFChanged | kSF31);
}
void ScummEngine_v90he::spriteInfoSet_field_78_64(int spriteId, int value) {
@@ -555,7 +555,7 @@
if (type == 0x7B) {
_spriteTable[spriteId].field_88 = value;
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
@@ -566,14 +566,14 @@
_spriteTable[spriteId].zoom = 0;
int tmp = 0;
- spriteInfoSet_addImageToList(spriteId, 1, &tmp);
+ spriteAddImageToList(spriteId, 1, &tmp);
_spriteTable[spriteId].field_54 = 0;
_spriteTable[spriteId].tx = 0;
_spriteTable[spriteId].ty = 0;
- _spriteTable[spriteId].flags &= ~(kSF14 | kSF15);
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags &= ~(kSF09 | kSF14 | kSF15);
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
_spriteTable[spriteId].dx = 0;
_spriteTable[spriteId].dy = 0;
_spriteTable[spriteId].field_44 = 0;
@@ -588,7 +588,7 @@
_spriteTable[spriteId].field_88 = 0;
}
-void ScummEngine_v90he::spriteInfoSet_addImageToList(int spriteId, int imageNum, int *spriteIdptr) {
+void ScummEngine_v90he::spriteAddImageToList(int spriteId, int imageNum, int *spriteIdptr) {
int listNum;
int *ptr;
int origResId;
@@ -635,16 +635,16 @@
if (_spriteTable[spriteId].res_id) {
_spriteTable[spriteId].res_wiz_states = getWizImageStates(_spriteTable[spriteId].res_id);
- _spriteTable[spriteId].flags |= kSF16 | kSF22 | kSF23 | kSFBlitDirectly;
+ _spriteTable[spriteId].flags |= kSFActive | kSF22 | kSF23 | kSFBlitDirectly;
if (_spriteTable[spriteId].res_id == origResId &&
_spriteTable[spriteId].res_wiz_states == spriteId)
return;
- _spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
} else {
_spriteTable[spriteId].flags &= ~(kSF31);
- _spriteTable[spriteId].flags |= kSF01 | kSFBlitDirectly;
+ _spriteTable[spriteId].flags |= kSFChanged | kSFBlitDirectly;
_spriteTable[spriteId].field_4C = 0;
_spriteTable[spriteId].field_48 = 0;
_spriteTable[spriteId].res_wiz_states = 0;
@@ -658,7 +658,7 @@
for (int i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (spi->group_num == spriteGroupId) {
- spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -672,7 +672,7 @@
_spriteTable[i].ty += value2;
if (value1 || value2)
- _spriteTable[i].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[i].flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -692,7 +692,7 @@
for (int i = 1; i < _varNumSprites; i++) {
if (_spriteTable[i].group_num == spriteGroupId) {
_spriteTable[i].group_num = value;
- _spriteTable[i].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[i].flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -705,7 +705,7 @@
if (value)
_spriteTable[i].flags |= kSF23 | kSFBlitDirectly;
else
- _spriteTable[i].flags &= ~(kSF01 | kSF23 | kSFBlitDirectly);
+ _spriteTable[i].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
}
}
}
@@ -738,7 +738,7 @@
if (value)
_spriteTable[i].flags |= kSF22;
else
- _spriteTable[i].flags &= ~(kSF01 | kSF22);
+ _spriteTable[i].flags &= ~(kSFChanged | kSF22);
}
}
}
@@ -750,7 +750,7 @@
if (_spriteTable[i].group_num == spriteGroupId) {
_spriteTable[i].field_54 = value;
if (_spriteTable[i].res_id)
- _spriteTable[i].flags |= kSF01 | kSFNeedRedraw;
+ _spriteTable[i].flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -909,7 +909,7 @@
for (i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (spi->group_num == spriteGroupId) {
- spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -919,18 +919,18 @@
for (i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (spi->group_num == spriteGroupId) {
- spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->flags |= kSFChanged | kSFNeedRedraw;
}
}
}
spg->flags &= ~kSGF01;
- spriteMarkIfInGroup(spriteGroupId, kSF01 | kSFNeedRedraw);
+ spriteMarkIfInGroup(spriteGroupId, kSFChanged | kSFNeedRedraw);
if (spg->field_20 != 0) {
spriteGroupCheck(spriteGroupId);
for (i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
if (spi->group_num == spriteGroupId) {
- spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -984,8 +984,8 @@
for (int i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
- if (!(spi->flags & kSF31) && (spi->flags & kSF01)) {
- spi->flags &= ~kSF01;
+ if (!(spi->flags & kSF31) && (spi->flags & kSFChanged)) {
+ spi->flags &= ~kSFChanged;
if (spi->bbox.left <= spi->bbox.right && spi->bbox.top <= spi->bbox.bottom) {
if (spi->flags & kSFBlitDirectly) {
gdi.copyVirtScreenBuffers(spi->bbox); // XXX 0, 0x40000000);
@@ -1054,7 +1054,7 @@
spi->tx += spi->dx;
spi->ty += spi->dy;
if (tx != spi->tx || ty != spi->ty) {
- spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->flags |= kSFChanged | kSFNeedRedraw;
}
}
if (spi->flags & kSF22) {
@@ -1081,7 +1081,7 @@
if (spi->field_74 != img2) {
spi->field_74 = img2;
spi->res_id = _imageListTable[0x21 * (img2 - 1)];
- spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->flags |= kSFChanged | kSFNeedRedraw;
spi->res_wiz_states = getWizImageStates(spi->res_id);
}
}
@@ -1090,7 +1090,7 @@
continue;
}
}
- spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->flags |= kSFChanged | kSFNeedRedraw;
}
}
}
@@ -1119,12 +1119,12 @@
for (int i = 1; i < _varNumSprites; i++) {
SpriteInfo *spi = &_spriteTable[i];
- if (spi->flags & kSF16) {
+ if (spi->flags & kSFActive) {
if (!spi->flags & kSF23) {
if (!(spi->flags & kSF30))
spi->flags |= kSFNeedRedraw;
if (!(spi->flags & kSF31))
- spi->flags |= kSF01;
+ spi->flags |= kSFChanged;
}
if (spi->group_num)
groupField = _spriteGroups[spi->group_num].field_10;
@@ -1172,7 +1172,7 @@
; //continue; // HACK
}
- spi->flags &= ~(kSF01 | kSFNeedRedraw);
+ spi->flags &= ~(kSFChanged | kSFNeedRedraw);
res_id = spi->res_id;
res_state = spi->res_state;
loadImgSpot(spi->res_id, spi->res_state, spr_wiz_x, spr_wiz_y);
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sprite_he.h 24 Feb 2005 20:20:35 -0000 1.12
+++ sprite_he.h 24 Feb 2005 21:05:29 -0000 1.13
@@ -26,7 +26,7 @@
namespace Scumm {
enum SpriteFlags {
- kSF01 = (1 << 0),
+ kSFChanged = (1 << 0),
kSFNeedRedraw = (1 << 1),
kSF03 = (1 << 2),
kSF04 = (1 << 3),
@@ -41,7 +41,7 @@
kSF13 = (1 << 12),
kSF14 = (1 << 13),
kSF15 = (1 << 14),
- kSF16 = (1 << 15),
+ kSFActive = (1 << 15),
kSF17 = (1 << 16),
kSF18 = (1 << 17),
kSF19 = (1 << 18),
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.205,2.206 script_v80he.cpp,2.75,2.76 script_v90he.cpp,2.155,2.156 sprite_he.cpp,1.47,1.48 sprite_he.h,1.11,1.12 wiz_he.cpp,2.3,2.4 wiz_he.h,2.3,2.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.365,2.366 script_v100he.cpp,2.62,2.63 script_v90he.cpp,2.157,2.158 sprite_he.cpp,1.49,1.50 sprite_he.h,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list