[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.447,2.448 script_v100he.cpp,2.132,2.133 script_v90he.cpp,2.232,2.233 sprite_he.cpp,1.129,1.130 sprite_he.h,1.36,1.37
kirben
kirben at users.sourceforge.net
Tue Apr 19 22:24:32 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.34,2.35 intern.h,2.446,2.447 scumm.cpp,1.443,1.444 scumm.h,1.589,1.590
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.133,2.134 script_v90he.cpp,2.233,2.234 sprite_he.cpp,1.130,1.131 wiz_he.h,2.17,2.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv650/scumm
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
sprite_he.h
Log Message:
Rename sprite field for HE games.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.447
retrieving revision 2.448
diff -u -d -r2.447 -r2.448
--- intern.h 20 Apr 2005 03:13:05 -0000 2.447
+++ intern.h 20 Apr 2005 05:24:02 -0000 2.448
@@ -998,7 +998,7 @@
int spriteInfoGet_wizSize(int spriteId);
int spriteInfoGet_zoom(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_8C_90(int spriteId, int type);
void getSpriteImageDim(int spriteId, int32 &w, int32 &h);
@@ -1015,7 +1015,7 @@
void spriteGroupGet_tx_ty(int spriteGroupId, int32 &tx, int32 &ty);
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_resetSprite(int spriteId);
void spriteInfoSet_resState(int spriteId, int value);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.132
retrieving revision 2.133
diff -u -d -r2.132 -r2.133
--- script_v100he.cpp 20 Apr 2005 00:46:37 -0000 2.132
+++ script_v100he.cpp 20 Apr 2005 05:24:02 -0000 2.133
@@ -1750,7 +1750,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_field_7C(spriteId, args[0]);
+ spriteInfoSet_maskImgResNum(spriteId, args[0]);
break;
case 16:
n = getStackList(args, ARRAYSIZE(args));
@@ -2490,7 +2490,7 @@
case 7:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_7C(spriteId));
+ push(spriteInfoGet_maskImgResNum(spriteId));
else
push(0);
break;
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.232
retrieving revision 2.233
diff -u -d -r2.232 -r2.233
--- script_v90he.cpp 20 Apr 2005 00:46:37 -0000 2.232
+++ script_v90he.cpp 20 Apr 2005 05:24:02 -0000 2.233
@@ -894,7 +894,7 @@
case 32:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_7C(spriteId));
+ push(spriteInfoGet_maskImgResNum(spriteId));
else
push(0);
break;
@@ -1135,7 +1135,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_field_7C(spriteId, args[0]);
+ spriteInfoSet_maskImgResNum(spriteId, args[0]);
break;
case 29:
args[0] = pop();
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- sprite_he.cpp 19 Apr 2005 17:54:59 -0000 1.129
+++ sprite_he.cpp 20 Apr 2005 05:24:02 -0000 1.130
@@ -360,10 +360,10 @@
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");
- return _spriteTable[spriteId].field_7C;
+ return _spriteTable[spriteId].maskImgResNum;
}
int ScummEngine_v90he::spriteInfoGet_field_80(int spriteId) {
@@ -500,11 +500,11 @@
}
}
-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");
- if (_spriteTable[spriteId].field_7C != value) {
- _spriteTable[spriteId].field_7C = value;
+ if (_spriteTable[spriteId].maskImgResNum != value) {
+ _spriteTable[spriteId].maskImgResNum = value;
_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
}
}
@@ -789,7 +789,7 @@
_spriteTable[spriteId].delayCount = 0;
_spriteTable[spriteId].classFlags = 0;
_spriteTable[spriteId].paletteNum = 0;
- _spriteTable[spriteId].field_7C = 0;
+ _spriteTable[spriteId].maskImgResNum = 0;
_spriteTable[spriteId].field_80 = 0;
_spriteTable[spriteId].zorderPriority = 0;
_spriteTable[spriteId].field_84 = 0;
@@ -1334,9 +1334,9 @@
}
if (spr_flags & kSFNeedPaletteRemap)
wiz.img.flags |= kWIFRemapPalette;
- if (spi->field_7C) {
+ if (spi->maskImgResNum) {
wiz.processFlags |= kWPFMaskImg;
- wiz.maskImgResNum = spi->field_7C;
+ wiz.maskImgResNum = spi->maskImgResNum;
}
wiz.processFlags |= kWPFNewFlags;
@@ -1409,7 +1409,7 @@
MKLINE(SpriteInfo, imgFlags, sleInt32, VER(48)),
MKLINE(SpriteInfo, field_74, 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_84, sleInt32, VER(48)),
MKLINE(SpriteInfo, classFlags, sleInt32, VER(48)),
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- sprite_he.h 15 Apr 2005 08:34:18 -0000 1.36
+++ sprite_he.h 20 Apr 2005 05:24:02 -0000 1.37
@@ -75,7 +75,7 @@
int32 imgFlags;
int32 field_74;
int32 delayAmount;
- int32 field_7C;
+ int32 maskImgResNum;
int32 field_80;
int32 field_84;
int32 classFlags;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.34,2.35 intern.h,2.446,2.447 scumm.cpp,1.443,1.444 scumm.h,1.589,1.590
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.133,2.134 script_v90he.cpp,2.233,2.234 sprite_he.cpp,1.130,1.131 wiz_he.h,2.17,2.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list