thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename sprite field for HE games.

Browse source 
svn-id: r17706
This commit is contained in:
Travis Howell 2005-04-20 05:24:02 +00:00
parent 89ca4bf716
commit 94e554a670
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/intern.h
View file

@ -998,7 +998,7 @@ protected:
int spriteInfoGet_wizSize(int spriteId); int spriteInfoGet_wizSize(int spriteId);
int spriteInfoGet_zoom(int spriteId); int spriteInfoGet_zoom(int spriteId);
int spriteInfoGet_delayAmount(int spriteId); int spriteInfoGet_delayAmount(int spriteId);
int spriteInfoGet_field_7C(int spriteId); int spriteInfoGet_maskImgResNum(int spriteId);
int spriteInfoGet_field_80(int spriteId); int spriteInfoGet_field_80(int spriteId);
int spriteInfoGet_field_8C_90(int spriteId, int type); int spriteInfoGet_field_8C_90(int spriteId, int type);
void getSpriteImageDim(int spriteId, int32 &w, int32 &h); void getSpriteImageDim(int spriteId, int32 &w, int32 &h);
@ -1015,7 +1015,7 @@ protected:
void spriteGroupGet_tx_ty(int spriteGroupId, int32 &tx, int32 &ty); void spriteGroupGet_tx_ty(int spriteGroupId, int32 &tx, int32 &ty);
void spriteInfoSet_paletteNum(int spriteId, int value); void spriteInfoSet_paletteNum(int spriteId, int value);
void spriteInfoSet_field_7C(int spriteId, int value); void spriteInfoSet_maskImgResNum(int spriteId, int value);
void spriteInfoSet_field_80(int spriteId, int value); void spriteInfoSet_field_80(int spriteId, int value);
void spriteInfoSet_resetSprite(int spriteId); void spriteInfoSet_resetSprite(int spriteId);
void spriteInfoSet_resState(int spriteId, int value); void spriteInfoSet_resState(int spriteId, int value);

4
scumm/script_v100he.cpp
View file

@ -1750,7 +1750,7 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
spriteId++; spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++) for (; spriteId <= _curMaxSpriteId; spriteId++)
spriteInfoSet_field_7C(spriteId, args[0]); spriteInfoSet_maskImgResNum(spriteId, args[0]);
break; break;
case 16: case 16:
n = getStackList(args, ARRAYSIZE(args)); n = getStackList(args, ARRAYSIZE(args));
@ -2490,7 +2490,7 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
case 7: case 7:
spriteId = pop(); spriteId = pop();
if (spriteId) if (spriteId)
push(spriteInfoGet_field_7C(spriteId)); push(spriteInfoGet_maskImgResNum(spriteId));
else else
push(0); push(0);
break; break;

4
scumm/script_v90he.cpp
View file

@ -894,7 +894,7 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
case 32: case 32:
spriteId = pop(); spriteId = pop();
if (spriteId) if (spriteId)
push(spriteInfoGet_field_7C(spriteId)); push(spriteInfoGet_maskImgResNum(spriteId));
else else
push(0); push(0);
break; break;
@ -1135,7 +1135,7 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
spriteId++; spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++) for (; spriteId <= _curMaxSpriteId; spriteId++)
spriteInfoSet_field_7C(spriteId, args[0]); spriteInfoSet_maskImgResNum(spriteId, args[0]);
break; break;
case 29: case 29:
args[0] = pop(); args[0] = pop();

18
scumm/sprite_he.cpp
View file

@ -360,10 +360,10 @@ int ScummEngine_v90he::spriteInfoGet_delayAmount(int spriteId) {
return _spriteTable[spriteId].delayAmount; return _spriteTable[spriteId].delayAmount;
} }
int ScummEngine_v90he::spriteInfoGet_field_7C(int spriteId) { int ScummEngine_v90he::spriteInfoGet_maskImgResNum(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d"); checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
return _spriteTable[spriteId].field_7C; return _spriteTable[spriteId].maskImgResNum;
} }
int ScummEngine_v90he::spriteInfoGet_field_80(int spriteId) { int ScummEngine_v90he::spriteInfoGet_field_80(int spriteId) {
@ -500,11 +500,11 @@ void ScummEngine_v90he::spriteInfoSet_paletteNum(int spriteId, int value) {
} }
} }
void ScummEngine_v90he::spriteInfoSet_field_7C(int spriteId, int value) { void ScummEngine_v90he::spriteInfoSet_maskImgResNum(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d"); checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
if (_spriteTable[spriteId].field_7C != value) { if (_spriteTable[spriteId].maskImgResNum != value) {
_spriteTable[spriteId].field_7C = value; _spriteTable[spriteId].maskImgResNum = value;
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw; _spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
} }
} }
@ -789,7 +789,7 @@ void ScummEngine_v90he::spriteInfoSet_resetSprite(int spriteId) {
_spriteTable[spriteId].delayCount = 0; _spriteTable[spriteId].delayCount = 0;
_spriteTable[spriteId].classFlags = 0; _spriteTable[spriteId].classFlags = 0;
_spriteTable[spriteId].paletteNum = 0; _spriteTable[spriteId].paletteNum = 0;
_spriteTable[spriteId].field_7C = 0; _spriteTable[spriteId].maskImgResNum = 0;
_spriteTable[spriteId].field_80 = 0; _spriteTable[spriteId].field_80 = 0;
_spriteTable[spriteId].zorderPriority = 0; _spriteTable[spriteId].zorderPriority = 0;
_spriteTable[spriteId].field_84 = 0; _spriteTable[spriteId].field_84 = 0;
@ -1334,9 +1334,9 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
} }
if (spr_flags & kSFNeedPaletteRemap) if (spr_flags & kSFNeedPaletteRemap)
wiz.img.flags |= kWIFRemapPalette; wiz.img.flags |= kWIFRemapPalette;
if (spi->field_7C) { if (spi->maskImgResNum) {
wiz.processFlags |= kWPFMaskImg; wiz.processFlags |= kWPFMaskImg;
wiz.maskImgResNum = spi->field_7C; wiz.maskImgResNum = spi->maskImgResNum;
} }
wiz.processFlags |= kWPFNewFlags; wiz.processFlags |= kWPFNewFlags;
@ -1409,7 +1409,7 @@ void ScummEngine_v90he::saveOrLoadSpriteData(Serializer *s, uint32 savegameVersi
MKLINE(SpriteInfo, imgFlags, sleInt32, VER(48)), MKLINE(SpriteInfo, imgFlags, sleInt32, VER(48)),
MKLINE(SpriteInfo, field_74, sleInt32, VER(48)), MKLINE(SpriteInfo, field_74, sleInt32, VER(48)),
MKLINE(SpriteInfo, delayAmount, sleInt32, VER(48)), MKLINE(SpriteInfo, delayAmount, sleInt32, VER(48)),
MKLINE(SpriteInfo, field_7C, sleInt32, VER(48)), MKLINE(SpriteInfo, maskImgResNum, sleInt32, VER(48)),
MKLINE(SpriteInfo, field_80, sleInt32, VER(48)), MKLINE(SpriteInfo, field_80, sleInt32, VER(48)),
MKLINE(SpriteInfo, field_84, sleInt32, VER(48)), MKLINE(SpriteInfo, field_84, sleInt32, VER(48)),
MKLINE(SpriteInfo, classFlags, sleInt32, VER(48)), MKLINE(SpriteInfo, classFlags, sleInt32, VER(48)),

2
scumm/sprite_he.h
View file

@ -75,7 +75,7 @@ struct SpriteInfo {
int32 imgFlags; int32 imgFlags;
int32 field_74; int32 field_74;
int32 delayAmount; int32 delayAmount;
int32 field_7C; int32 maskImgResNum;
int32 field_80; int32 field_80;
int32 field_84; int32 field_84;
int32 classFlags; int32 classFlags;