[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.395,2.396 script_v100he.cpp,2.90,2.91 script_v90he.cpp,2.185,2.186 sprite_he.cpp,1.101,1.102 sprite_he.h,1.23,1.24
kirben
kirben at users.sourceforge.net
Mon Mar 14 04:55:16 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5598/scumm
Modified Files:
intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp
sprite_he.h
Log Message:
Rename sprite fields/functions
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.395
retrieving revision 2.396
diff -u -d -r2.395 -r2.396
--- intern.h 13 Mar 2005 13:25:27 -0000 2.395
+++ intern.h 14 Mar 2005 12:54:23 -0000 2.396
@@ -923,14 +923,14 @@
int spriteInfoGet_resState(int spriteId);
int spriteInfoGet_groupNum(int spriteId);
int spriteInfoGet_field_14(int spriteId);
- int spriteInfoGet_field_18(int spriteId);
+ int spriteInfoGet_zorderPriority(int spriteId);
int spriteInfoGet_grp_tx(int spriteId);
int spriteInfoGet_grp_ty(int spriteId);
int spriteInfoGet_field_44(int spriteId);
int spriteInfoGet_field_54(int spriteId);
int spriteInfoGet_wizSize(int spriteId);
int spriteInfoGet_zoom(int spriteId);
- int spriteInfoGet_field_78(int spriteId);
+ int spriteInfoGet_delayAmount(int spriteId);
int spriteInfoGet_field_7C(int spriteId);
int spriteInfoGet_field_80(int spriteId);
int spriteInfoGet_field_88(int spriteId, int type);
@@ -957,7 +957,7 @@
void spriteInfoSet_dx_dy(int spriteId, int value1, int value2);
void spriteInfoSet_field_54(int spriteId, int value);
void spriteInfoSet_field_44(int spriteId, int value1, int value2);
- void spriteInfoSet_field_18(int spriteId, int value);
+ void spriteInfoSet_zorderPriority(int spriteId, int value);
void spriteInfoSet_Inc_tx_ty(int spriteId, int value1, int value2);
void spriteInfoSet_zoom(int spriteId, int value);
void spriteInfoSet_rotAngle(int spriteId, int value);
@@ -969,7 +969,7 @@
void spriteInfoSet_flagYFlipped(int spriteId, int value);
void spriteInfoSet_flagXFlipped(int spriteId, int value);
void spriteInfoSet_flagHasImage(int spriteId, int value);
- void spriteInfoSet_field_78_64(int spriteId, int value);
+ void spriteInfoSet_delay(int spriteId, int value);
void spriteInfoSet_setClassFlags(int spriteId, int value);
void spriteInfoSet_setClassFlag(int spriteId, int classId, int toggle);
void spriteInfoSet_resetClassFlags(int spriteId);
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.90
retrieving revision 2.91
diff -u -d -r2.90 -r2.91
--- script_v100he.cpp 13 Mar 2005 13:25:27 -0000 2.90
+++ script_v100he.cpp 14 Mar 2005 12:54:23 -0000 2.91
@@ -1770,7 +1770,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_field_78_64(spriteId, args[0]);
+ spriteInfoSet_delay(spriteId, args[0]);
break;
case 6:
args[1] = pop();
@@ -1912,7 +1912,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_field_18(spriteId, args[0]);
+ spriteInfoSet_zorderPriority(spriteId, args[0]);
break;
case 60:
args[1] = pop();
@@ -2522,7 +2522,7 @@
case 4:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_78(spriteId));
+ push(spriteInfoGet_delayAmount(spriteId));
else
push(1);
break;
@@ -2627,7 +2627,7 @@
case 59:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_18(spriteId));
+ push(spriteInfoGet_zorderPriority(spriteId));
else
push(0);
break;
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.185
retrieving revision 2.186
diff -u -d -r2.185 -r2.186
--- script_v90he.cpp 13 Mar 2005 13:25:27 -0000 2.185
+++ script_v90he.cpp 14 Mar 2005 12:54:23 -0000 2.186
@@ -859,7 +859,7 @@
case 13:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_18(spriteId));
+ push(spriteInfoGet_zorderPriority(spriteId));
else
push(0);
break;
@@ -936,7 +936,7 @@
case 67:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_78(spriteId));
+ push(spriteInfoGet_delayAmount(spriteId));
else
push(1);
break;
@@ -1084,7 +1084,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_field_18(spriteId, args[0]);
+ spriteInfoSet_zorderPriority(spriteId, args[0]);
break;
case 10:
args[1] = pop();
@@ -1231,7 +1231,7 @@
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_field_78_64(spriteId, args[0]);
+ spriteInfoSet_delay(spriteId, args[0]);
break;
case 64:
args[0] = pop();
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- sprite_he.cpp 13 Mar 2005 13:25:28 -0000 1.101
+++ sprite_he.cpp 14 Mar 2005 12:54:23 -0000 1.102
@@ -246,10 +246,10 @@
return _spriteTable[spriteId].field_14;
}
-int ScummEngine_v90he::spriteInfoGet_field_18(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_zorderPriority(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return _spriteTable[spriteId].field_18;
+ return _spriteTable[spriteId].zorderPriority;
}
int ScummEngine_v90he::spriteInfoGet_grp_tx(int spriteId) {
@@ -294,10 +294,10 @@
return _spriteTable[spriteId].zoom;
}
-int ScummEngine_v90he::spriteInfoGet_field_78(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_delayAmount(int spriteId) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- return _spriteTable[spriteId].field_78;
+ return _spriteTable[spriteId].delayAmount;
}
int ScummEngine_v90he::spriteInfoGet_field_7C(int spriteId) {
@@ -498,10 +498,10 @@
_spriteTable[spriteId].field_44 = value2;
}
-void ScummEngine_v90he::spriteInfoSet_field_18(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_zorderPriority(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- _spriteTable[spriteId].field_18 = value;
+ _spriteTable[spriteId].zorderPriority = value;
}
void ScummEngine_v90he::spriteInfoSet_Inc_tx_ty(int spriteId, int value1, int value2) {
@@ -629,11 +629,11 @@
_spriteTable[spriteId].flags &= ~(kSFChanged | kSFImageless);
}
-void ScummEngine_v90he::spriteInfoSet_field_78_64(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_delay(int spriteId, int value) {
checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
- _spriteTable[spriteId].field_78 = value;
- _spriteTable[spriteId].field_64 = value;
+ _spriteTable[spriteId].delayAmount = value;
+ _spriteTable[spriteId].delayCount = value;
}
void ScummEngine_v90he::spriteInfoSet_setClassFlags(int spriteId, int value) {
@@ -687,14 +687,13 @@
_spriteTable[spriteId].dy = 0;
_spriteTable[spriteId].field_44 = 0;
_spriteTable[spriteId].group_num = 0;
- _spriteTable[spriteId].field_78 = 0;
- _spriteTable[spriteId].field_64 = 0;
+ _spriteTable[spriteId].delayAmount = 0;
+ _spriteTable[spriteId].delayCount = 0;
_spriteTable[spriteId].class_flags = 0;
_spriteTable[spriteId].field_14 = 0;
_spriteTable[spriteId].field_7C = 0;
_spriteTable[spriteId].field_80 = 0;
- // freddicove specific
- //_spriteTable[spriteId].field_18 = 0;
+ _spriteTable[spriteId].zorderPriority = 0;
_spriteTable[spriteId].field_88 = 0;
}
@@ -758,7 +757,7 @@
for (int i = 1; i < _varNumSprites; i++) {
if (_spriteTable[i].group_num == spriteGroupId)
- _spriteTable[i].field_18 = value;
+ _spriteTable[i].zorderPriority = value;
}
}
@@ -800,8 +799,8 @@
for (int i = 1; i < _varNumSprites; i++) {
if (_spriteTable[i].group_num == spriteGroupId) {
- _spriteTable[i].field_78 = value;
- _spriteTable[i].field_64 = value;
+ _spriteTable[i].delayAmount = value;
+ _spriteTable[i].delayCount = value;
}
}
}
@@ -1043,7 +1042,7 @@
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)) {
+ if ((!unkFlag || spi->zorderPriority >= 0) && (spi->flags & kSF23)) {
bool needRedraw = false;
int lp = MIN(79, spi->bbox.left / 8);
int rp = MIN(79, (spi->bbox.right + 7) / 8);
@@ -1074,12 +1073,12 @@
}
}
if (spi->flags & kSF22) {
- if (spi->field_78) {
- --spi->field_64;
- if (spi->field_64)
+ if (spi->delayAmount) {
+ --spi->delayCount;
+ if (spi->delayCount)
continue;
- spi->field_64 = spi->field_78;
+ spi->delayCount = spi->delayAmount;
}
int state = spi->res_state;
++spi->res_state;
@@ -1130,7 +1129,7 @@
groupZorder = 0;
spi->id = i;
- spi->zorder = spi->field_18 + groupZorder;
+ spi->zorder = spi->zorderPriority + groupZorder;
_activeSpritesTable[_numSpritesToProcess++] = spi;
}
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sprite_he.h 13 Mar 2005 13:10:39 -0000 1.23
+++ sprite_he.h 14 Mar 2005 12:54:24 -0000 1.24
@@ -73,7 +73,7 @@
int res_state;
int group_num;
int field_14;
- int field_18;
+ int zorderPriority;
Common::Rect bbox;
int dx;
int dy;
@@ -88,12 +88,12 @@
int res_wiz_states;
int rot_angle;
int zoom;
- int field_64;
+ int delayCount;
int cur_rot_angle;
int cur_zoom;
int imgFlags;
int field_74;
- int field_78;
+ int delayAmount;
int field_7C;
int field_80;
int class_flags;
More information about the Scummvm-git-logs
mailing list