[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.386,2.387 sprite_he.cpp,1.92,1.93
kirben
kirben at users.sourceforge.net
Tue Mar 8 04:37:11 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18715/scumm
Modified Files:
intern.h sprite_he.cpp
Log Message:
Remove unused sprite code, unused by original games.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.386
retrieving revision 2.387
diff -u -d -r2.386 -r2.387
--- intern.h 8 Mar 2005 05:56:18 -0000 2.386
+++ intern.h 8 Mar 2005 12:36:32 -0000 2.387
@@ -876,9 +876,6 @@
SpriteInfo *_spriteTable;
SpriteGroup *_spriteGroups;
SpriteInfo **_activeSpritesTable;
- uint16 *_imageListTable;
- uint16 *_imageListStack;
- int _curSprImageListNum;
public:
ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v80he(detector, syst, gs, md5sum) {}
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- sprite_he.cpp 7 Mar 2005 21:58:47 -0000 1.92
+++ sprite_he.cpp 8 Mar 2005 12:36:32 -0000 1.93
@@ -700,49 +700,14 @@
}
void ScummEngine_v90he::spriteAddImageToList(int spriteId, int imageNum, int *spriteIdptr) {
- int listNum;
- int *ptr;
int origResId, origResWizStates;
- // XXX needs review
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- if (_spriteTable[spriteId].imglist_num) {
- checkRange(_varMaxSprites, 1, _spriteTable[spriteId].imglist_num,
- "Image list %d out of range");
- _imageListStack[_curSprImageListNum++] = _spriteTable[spriteId].imglist_num - 1;
- _spriteTable[spriteId].imglist_num = 0;
- }
-
origResId = _spriteTable[spriteId].res_id;
origResWizStates = _spriteTable[spriteId].res_wiz_states;
- if (imageNum == 1) {
- _spriteTable[spriteId].res_id = *spriteIdptr;
- } else {
- // This section is currently never called
- if (!_curSprImageListNum)
- error("Out of image lists");
-
- if (imageNum > 32)
- error("Too many images in image list (%d)!", imageNum);
-
- _curSprImageListNum--;
- _spriteTable[spriteId].imglist_num = _imageListStack[_curSprImageListNum] + 1;
-
- listNum = _spriteTable[spriteId].imglist_num;
-
- checkRange(_varMaxSprites, 1, listNum, "Image list %d out of range");
-
- _imageListTable[0x21 * listNum - 1] = imageNum;
-
- ptr = spriteIdptr;
- for (int i = 0; i < listNum; i++) {
- _imageListTable[0x21 * listNum - 0x21 + i] = *ptr++;
- }
- _spriteTable[spriteId].res_id = *spriteIdptr;
- }
-
+ _spriteTable[spriteId].res_id = *spriteIdptr;
_spriteTable[spriteId].field_74 = 0;
_spriteTable[spriteId].res_state = 0;
@@ -988,8 +953,6 @@
_spriteGroups = (SpriteGroup *)malloc((_varNumSpriteGroups + 1) * sizeof(SpriteGroup));
_spriteTable = (SpriteInfo *)malloc((_varNumSprites + 1) * sizeof(SpriteInfo));
_activeSpritesTable = (SpriteInfo **)malloc((_varNumSprites + 1) * sizeof(SpriteInfo *));
- _imageListTable = (uint16 *)malloc((_varMaxSprites + 1) * sizeof(uint16) * 2 + 1);
- _imageListStack = (uint16 *)malloc((_varMaxSprites + 1) * sizeof(uint16));
}
void ScummEngine_v90he::spritesResetGroup(int spriteGroupId) {
@@ -1013,11 +976,6 @@
}
void ScummEngine_v90he::spritesResetTables(bool refreshScreen) {
- int i;
-
- for (i = 0; i < _varMaxSprites; ++i) {
- _imageListStack[i] = i;
- }
memset(_spriteTable, 0, (_varNumSprites + 1) * sizeof(SpriteInfo));
memset(_spriteGroups, 0, (_varNumSpriteGroups + 1) * sizeof(SpriteGroup));
for (int curGrp = 1; curGrp < _varNumSpriteGroups; ++curGrp)
@@ -1123,25 +1081,8 @@
++spi->res_state;
if (spi->res_state >= spi->res_wiz_states) {
spi->res_state = 0;
- if (spi->imglist_num) {
- if (!(spi->flags & kSF25)) {
- 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 |= kSFChanged | kSFNeedRedraw;
- spi->res_wiz_states = getWizImageStates(spi->res_id);
- }
- }
- continue;
- } else if (state == 0) {
+ if (state == 0)
continue;
- }
}
spi->flags |= kSFChanged | kSFNeedRedraw;
}
More information about the Scummvm-git-logs
mailing list