[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.349,2.350 sprite_he.cpp,1.19,1.20 sprite_he.h,1.7,1.8
Gregory Montoir
cyx at users.sourceforge.net
Tue Feb 22 13:40:23 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga isomap.cpp,1.32,1.33 isomap.h,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.351,2.352 script_v90he.cpp,2.143,2.144 sprite_he.cpp,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30885/scumm
Modified Files:
intern.h sprite_he.cpp sprite_he.h
Log Message:
some WIP stuff for HE sprites
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.349
retrieving revision 2.350
diff -u -d -r2.349 -r2.350
--- intern.h 22 Feb 2005 01:25:53 -0000 2.349
+++ intern.h 22 Feb 2005 21:38:41 -0000 2.350
@@ -936,11 +936,13 @@
void spriteInfoSet_flag31(int spriteId, int value);
void spriteInfoSet_field_78_64(int spriteId, int value);
- void spritesAllocTables(int numSprites, int numGroups, int numImgSprites);
+ void spritesAllocTables(int numSprites, int numGroups, int numMaxSprites);
void spritesResetTables(bool refreshScreen);
void spriteGroupCheck(int spriteGroupId);
void spriteMarkIfInGroup(int spriteGroupId, uint32 flags);
void spritesBlitToScreen();
+ void spritesMarkDirty(bool unkFlag);
+ void spritesUpdateImages();
void spriteInfoSet_addImageToList(int spriteId, int imageNum, int *spriteIdptr);
/* HE version 90 script opcodes */
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sprite_he.cpp 22 Feb 2005 01:25:53 -0000 1.19
+++ sprite_he.cpp 22 Feb 2005 21:38:43 -0000 1.20
@@ -212,8 +212,8 @@
void ScummEngine_v90he::spriteInfoGet_field_2C_30(int spriteId, int32 &field_2C, int32 &field_30) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- field_2C = _spriteTable[spriteId].field_2C;
- field_30 = _spriteTable[spriteId].field_30;
+ field_2C = _spriteTable[spriteId].dx;
+ field_30 = _spriteTable[spriteId].dy;
}
//
@@ -333,8 +333,8 @@
void ScummEngine_v90he::spriteInfoSet_field_2C_30(int spriteId, int value1, int value2) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- _spriteTable[spriteId].field_2C = value1;
- _spriteTable[spriteId].field_30 = value2;
+ _spriteTable[spriteId].dx = value1;
+ _spriteTable[spriteId].dy = value2;
}
void ScummEngine_v90he::spriteInfoSet_field_54(int spriteId, int value) {
@@ -495,21 +495,21 @@
// TODO
}
-void ScummEngine_v90he::spritesAllocTables(int numSprites, int numGroups, int numImgLists) {
+void ScummEngine_v90he::spritesAllocTables(int numSprites, int numGroups, int numMaxSprites) {
_varNumSpriteGroups = numGroups;
_numSpritesToProcess = 0;
_varNumSprites = numSprites;
- _varNumImgLists = numImgLists;
+ _varMaxSprites = numMaxSprites;
_spriteGroups = (SpriteGroup *)malloc((_varNumSpriteGroups + 1) * sizeof(SpriteGroup));
_spriteTable = (SpriteInfo *)malloc((_varNumSprites + 1) * sizeof(SpriteInfo));
_activeSpritesTable = (SpriteInfo **)malloc((_varNumSprites + 1) * sizeof(SpriteInfo *));
- _imageListTable = (uint32 *)malloc((_varNumImgLists + 1) * sizeof(uint32)); // XXX
- _imageListStack = (uint16 *)malloc((_varNumImgLists + 1) * sizeof(uint16));
+ _imageListTable = (uint16 *)malloc((_varMaxSprites + 1) * sizeof(uint16) * 2 + 1);
+ _imageListStack = (uint16 *)malloc((_varMaxSprites + 1) * sizeof(uint16));
}
void ScummEngine_v90he::spritesResetTables(bool refreshScreen) {
int i;
- for (i = 0; i < _varNumImgLists; ++i) {
+ for (i = 0; i < _varMaxSprites; ++i) {
_imageListStack[i] = i;
}
memset(_spriteTable, 0, (_varNumSprites + 1) * sizeof(SpriteInfo));
@@ -622,4 +622,78 @@
}
}
+void ScummEngine_v90he::spritesMarkDirty(bool unkFlag) {
+ VirtScreen *vs0 = &virtscr[kMainVirtScreen];
+ for (int i = 0; i < _numSpritesToProcess; ++i) {
+ SpriteInfo *spi = _activeSpritesTable[i];
+ if (!(spi->flags & (kSFNeedRedraw | kSF30))) {
+ if ((!unkFlag || spi->field_18 >= 0) && (spi->flags & kSF23)) {
+ bool needRedraw = false;
+ int lp = MIN(79, spi->bbox_xmin / 8);
+ int rp = MIN(79, (spi->bbox_xmax + 7) / 8);
+ for (; lp <= rp; ++lp) {
+ if (vs0->tdirty[lp] < vs0->h && spi->bbox_ymax >= vs0->bdirty[lp] && spi->bbox_ymin <= vs0->tdirty[lp]) {
+ needRedraw = true;
+ break;
+ }
+ }
+ if (needRedraw) {
+ spi->flags |= kSFNeedRedraw;
+ }
+ }
+ }
+ }
+}
+
+void ScummEngine_v90he::spritesUpdateImages() {
+ for (int i = 0; i < _numSpritesToProcess; ++i) {
+ SpriteInfo *spi = _activeSpritesTable[i];
+ if (spi->dx != 0 || spi->dy != 0) {
+ checkRange(_varNumSprites, 1, i, "Invalid sprite %d");
+ int tx = spi->tx;
+ int ty = spi->ty;
+ spi->tx += spi->dx;
+ spi->ty += spi->dy;
+ if (tx != spi->tx || ty != spi->ty) {
+ spi->flags |= kSF01 | kSFNeedRedraw;
+ }
+ }
+ if (spi->flags & kSF22) {
+ if (spi->field_78 != 0) {
+ --spi->field_64;
+ if (spi->field_64 != 0) {
+ continue;
+ }
+ spi->field_64 = spi->field_78;
+ }
+ int state = spi->res_state;
+ ++spi->res_state;
+ if (spi->res_state >= spi->res_wiz_states) {
+ spi->res_state = 0;
+ if (spi->imglist_num != 0) {
+ if (!(spi->flags & kSF25)) {
+ // XXX
+ checkRange(_varMaxSprites, 1, spi->imglist_num, "Image list %d out of range");
+ uint16 img1 = _imageListTable[0x21 * spi->imglist_num - 1];
+ uint16 img2 = spi->field_74 + 1;
+ if (img2 >= img1) {
+ img2 = 0;
+ }
+ if (spi->field_74 != img2) {
+ spi->field_74 = img2;
+ spi->res_id = _imageListTable[0x21 * (img2 - 1)];
+ spi->flags |= kSF01 | kSFNeedRedraw;
+ spi->res_wiz_states = getWizImageStates(spi->res_id);
+ }
+ }
+ continue;
+ } else if (state == 0) {
+ continue;
+ }
+ }
+ spi->flags |= kSF01 | kSFNeedRedraw;
+ }
+ }
+}
+
} // End of namespace Scumm
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sprite_he.h 22 Feb 2005 01:23:15 -0000 1.7
+++ sprite_he.h 22 Feb 2005 21:38:44 -0000 1.8
@@ -77,8 +77,8 @@
int bbox_ymin;
int bbox_xmax;
int bbox_ymax;
- int field_2C;
- int field_30;
+ int dx;
+ int dy;
int field_34;
int field_38;
int tx;
@@ -124,11 +124,11 @@
int _varNumSpriteGroups;
int _numSpritesToProcess;
int _varNumSprites;
- int _varNumImgLists;
+ int _varMaxSprites;
SpriteInfo *_spriteTable;
SpriteGroup *_spriteGroups;
SpriteInfo **_activeSpritesTable;
- uint32 *_imageListTable; // XXX wrong type
+ uint16 *_imageListTable;
uint16 *_imageListStack;
int _curSprImageListNum;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga isomap.cpp,1.32,1.33 isomap.h,1.14,1.15
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.351,2.352 script_v90he.cpp,2.143,2.144 sprite_he.cpp,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list