aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-03-14 12:54:24 +0000
committerTravis Howell2005-03-14 12:54:24 +0000
commit8776504882864e2e9e558ef999733077c4ab39c8 (patch)
treea8e2f5aceb44fbb76adac41ae8c988f4e50bc55e
parent10f21cfe2c53e470ac00de11ce063d65a5cd0113 (diff)
downloadscummvm-rg350-8776504882864e2e9e558ef999733077c4ab39c8.tar.gz
scummvm-rg350-8776504882864e2e9e558ef999733077c4ab39c8.tar.bz2
scummvm-rg350-8776504882864e2e9e558ef999733077c4ab39c8.zip
Rename sprite fields/functions
svn-id: r17136
-rw-r--r--scumm/intern.h8
-rw-r--r--scumm/script_v100he.cpp8
-rw-r--r--scumm/script_v90he.cpp8
-rw-r--r--scumm/sprite_he.cpp43
-rw-r--r--scumm/sprite_he.h6
5 files changed, 36 insertions, 37 deletions
diff --git a/scumm/intern.h b/scumm/intern.h
index 464bd88249..e52a8c2f8c 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -923,14 +923,14 @@ protected:
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 @@ protected:
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 @@ protected:
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);
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 65650be3db..92c1347acd 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -1770,7 +1770,7 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
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 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
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 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
case 4:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_78(spriteId));
+ push(spriteInfoGet_delayAmount(spriteId));
else
push(1);
break;
@@ -2627,7 +2627,7 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
case 59:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_18(spriteId));
+ push(spriteInfoGet_zorderPriority(spriteId));
else
push(0);
break;
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index ed7841843b..be0f010278 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -859,7 +859,7 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
case 13:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_18(spriteId));
+ push(spriteInfoGet_zorderPriority(spriteId));
else
push(0);
break;
@@ -936,7 +936,7 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
case 67:
spriteId = pop();
if (spriteId)
- push(spriteInfoGet_field_78(spriteId));
+ push(spriteInfoGet_delayAmount(spriteId));
else
push(1);
break;
@@ -1084,7 +1084,7 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
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 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
spriteId++;
for (; spriteId <= _curMaxSpriteId; spriteId++)
- spriteInfoSet_field_78_64(spriteId, args[0]);
+ spriteInfoSet_delay(spriteId, args[0]);
break;
case 64:
args[0] = pop();
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index 56478af3ee..7d46025d8d 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -246,10 +246,10 @@ int ScummEngine_v90he::spriteInfoGet_field_14(int spriteId) {
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 @@ int ScummEngine_v90he::spriteInfoGet_zoom(int spriteId) {
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 @@ void ScummEngine_v90he::spriteInfoSet_field_44(int spriteId, int value1, int val
_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 @@ void ScummEngine_v90he::spriteInfoSet_flagHasImage(int spriteId, int value) {
_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 @@ void ScummEngine_v90he::spriteInfoSet_resetSprite(int spriteId) {
_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 @@ void ScummEngine_v90he::spriteGroupSet_case0_1(int spriteGroupId, int value) {
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 @@ void ScummEngine_v90he::spriteGroupSet_case0_5(int spriteGroupId, int value) {
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 @@ void ScummEngine_v90he::spritesMarkDirty(bool unkFlag) {
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 @@ void ScummEngine_v90he::spritesUpdateImages() {
}
}
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 @@ void ScummEngine_v90he::spritesSortActiveSprites() {
groupZorder = 0;
spi->id = i;
- spi->zorder = spi->field_18 + groupZorder;
+ spi->zorder = spi->zorderPriority + groupZorder;
_activeSpritesTable[_numSpritesToProcess++] = spi;
}
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index cd18060d8e..dcf215017d 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -73,7 +73,7 @@ struct SpriteInfo {
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 @@ struct SpriteInfo {
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;