aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scumm/script_v100he.cpp20
-rw-r--r--scumm/script_v90he.cpp20
-rw-r--r--scumm/sprite_he.cpp22
-rw-r--r--scumm/sprite_he.h25
4 files changed, 44 insertions, 43 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index b12ea02d9a..64ac36bd1c 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -1033,16 +1033,16 @@ void ScummEngine_v100he::o100_setSpriteGroupInfo() {
switch (type) {
case 0:
- _sprite->setGroupScale_x_ratio_mul(_curSpriteGroupId, value1);
+ _sprite->setGroupXMul(_curSpriteGroupId, value1);
break;
case 1:
- _sprite->setGroupScale_x_ratio_div(_curSpriteGroupId, value1);
+ _sprite->setGroupXDiv(_curSpriteGroupId, value1);
break;
case 2:
- _sprite->setGroupScale_y_ratio_mul(_curSpriteGroupId, value1);
+ _sprite->setGroupYMul(_curSpriteGroupId, value1);
break;
case 3:
- _sprite->setGroupScale_y_ratio_div(_curSpriteGroupId, value1);
+ _sprite->setGroupYDiv(_curSpriteGroupId, value1);
break;
default:
error("o100_setSpriteGroupInfo subOp 60: Unknown case %d", subOp);
@@ -2396,16 +2396,16 @@ void ScummEngine_v100he::o100_getSpriteGroupInfo() {
if (spriteGroupId) {
switch(type) {
case 0:
- push(_sprite->getGroupScale_x_ratio_mul(spriteGroupId));
+ push(_sprite->getGroupXMul(spriteGroupId));
break;
case 1:
- push(_sprite->getGroupScale_x_ratio_div(spriteGroupId));
+ push(_sprite->getGroupXDiv(spriteGroupId));
break;
case 2:
- push(_sprite->getGroupScale_y_ratio_mul(spriteGroupId));
+ push(_sprite->getGroupYMul(spriteGroupId));
break;
case 3:
- push(_sprite->getGroupScale_y_ratio_div(spriteGroupId));
+ push(_sprite->getGroupYDiv(spriteGroupId));
break;
default:
push(0);
@@ -2417,7 +2417,7 @@ void ScummEngine_v100he::o100_getSpriteGroupInfo() {
case 85:
spriteGroupId = pop();
if (spriteGroupId) {
- _sprite->getGrouptx_ty(spriteGroupId, tx, ty);
+ _sprite->getGroupPosition(spriteGroupId, tx, ty);
push(tx);
} else {
push(0);
@@ -2426,7 +2426,7 @@ void ScummEngine_v100he::o100_getSpriteGroupInfo() {
case 86:
spriteGroupId = pop();
if (spriteGroupId) {
- _sprite->getGrouptx_ty(spriteGroupId, tx, ty);
+ _sprite->getGroupPosition(spriteGroupId, tx, ty);
push(ty);
} else {
push(0);
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 615e32d1ad..ed729deb4e 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -1460,7 +1460,7 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() {
case 30:
spriteGroupId = pop();
if (spriteGroupId) {
- _sprite->getGrouptx_ty(spriteGroupId, tx, ty);
+ _sprite->getGroupPosition(spriteGroupId, tx, ty);
push(tx);
} else {
push(0);
@@ -1469,7 +1469,7 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() {
case 31:
spriteGroupId = pop();
if (spriteGroupId) {
- _sprite->getGrouptx_ty(spriteGroupId, tx, ty);
+ _sprite->getGroupPosition(spriteGroupId, tx, ty);
push(ty);
} else {
push(0);
@@ -1481,16 +1481,16 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() {
if (spriteGroupId) {
switch(type) {
case 0:
- push(_sprite->getGroupScale_x_ratio_mul(spriteGroupId));
+ push(_sprite->getGroupXMul(spriteGroupId));
break;
case 1:
- push(_sprite->getGroupScale_x_ratio_div(spriteGroupId));
+ push(_sprite->getGroupXDiv(spriteGroupId));
break;
case 2:
- push(_sprite->getGroupScale_y_ratio_mul(spriteGroupId));
+ push(_sprite->getGroupYMul(spriteGroupId));
break;
case 3:
- push(_sprite->getGroupScale_y_ratio_div(spriteGroupId));
+ push(_sprite->getGroupYDiv(spriteGroupId));
break;
default:
push(0);
@@ -1603,16 +1603,16 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() {
switch (type) {
case 0:
- _sprite->setGroupScale_x_ratio_mul(_curSpriteGroupId, value1);
+ _sprite->setGroupXMul(_curSpriteGroupId, value1);
break;
case 1:
- _sprite->setGroupScale_x_ratio_div(_curSpriteGroupId, value1);
+ _sprite->setGroupXDiv(_curSpriteGroupId, value1);
break;
case 2:
- _sprite->setGroupScale_y_ratio_mul(_curSpriteGroupId, value1);
+ _sprite->setGroupYMul(_curSpriteGroupId, value1);
break;
case 3:
- _sprite->setGroupScale_y_ratio_div(_curSpriteGroupId, value1);
+ _sprite->setGroupYDiv(_curSpriteGroupId, value1);
break;
default:
error("o90_setSpriteGroupInfo subOp 5: Unknown case %d", subOp);
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index 9bb0c62b6f..9b1185f6f4 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -449,31 +449,31 @@ int Sprite::getGroupDstResNum(int spriteGroupId) {
return _spriteGroups[spriteGroupId].image;
}
-int Sprite::getGroupScale_x_ratio_mul(int spriteGroupId) {
+int Sprite::getGroupXMul(int spriteGroupId) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
return _spriteGroups[spriteGroupId].scale_x_ratio_mul;
}
-int Sprite::getGroupScale_x_ratio_div(int spriteGroupId) {
+int Sprite::getGroupXDiv(int spriteGroupId) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
return _spriteGroups[spriteGroupId].scale_x_ratio_div;
}
-int Sprite::getGroupScale_y_ratio_mul(int spriteGroupId) {
+int Sprite::getGroupYMul(int spriteGroupId) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
return _spriteGroups[spriteGroupId].scale_y_ratio_mul;
}
-int Sprite::getGroupScale_y_ratio_div(int spriteGroupId) {
+int Sprite::getGroupYDiv(int spriteGroupId) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
return _spriteGroups[spriteGroupId].scale_y_ratio_div;
}
-void Sprite::getGrouptx_ty(int spriteGroupId, int32 &tx, int32 &ty) {
+void Sprite::getGroupPosition(int spriteGroupId, int32 &tx, int32 &ty) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
tx = _spriteGroups[spriteGroupId].tx;
@@ -976,7 +976,7 @@ void Sprite::setGroupScaling(int spriteGroupId) {
}
-void Sprite::setGroupScale_x_ratio_mul(int spriteGroupId, int value) {
+void Sprite::setGroupXMul(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
if (_spriteGroups[spriteGroupId].scale_x_ratio_mul != value) {
@@ -986,11 +986,11 @@ void Sprite::setGroupScale_x_ratio_mul(int spriteGroupId, int value) {
}
}
-void Sprite::setGroupScale_x_ratio_div(int spriteGroupId, int value) {
+void Sprite::setGroupXDiv(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
if (value == 0)
- error("setGroupScale_x_ratio_div: Divisor must not be 0");
+ error("setGroupXDiv: Divisor must not be 0");
if (_spriteGroups[spriteGroupId].scale_x_ratio_div != value) {
_spriteGroups[spriteGroupId].scale_x_ratio_div = value;
@@ -999,7 +999,7 @@ void Sprite::setGroupScale_x_ratio_div(int spriteGroupId, int value) {
}
}
-void Sprite::setGroupScale_y_ratio_mul(int spriteGroupId, int value) {
+void Sprite::setGroupYMul(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
if (_spriteGroups[spriteGroupId].scale_y_ratio_mul != value) {
@@ -1009,11 +1009,11 @@ void Sprite::setGroupScale_y_ratio_mul(int spriteGroupId, int value) {
}
}
-void Sprite::setGroupScale_y_ratio_div(int spriteGroupId, int value) {
+void Sprite::setGroupYDiv(int spriteGroupId, int value) {
checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
if (value == 0)
- error("setGroupScale_y_ratio_div: Divisor must not be 0");
+ error("setGroupYDiv: Divisor must not be 0");
if (_spriteGroups[spriteGroupId].scale_y_ratio_div != value) {
_spriteGroups[spriteGroupId].scale_y_ratio_div = value;
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index 1f3a004434..84718a22e2 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -119,7 +119,6 @@ public:
void processImages(bool arg);
void updateImages();
- void getSpriteBounds(int spriteId, bool checkGroup, Common::Rect &bound);
int findSpriteWithClassOf(int x, int y, int spriteGroupId, int d, int num, int *args);
int getSpriteClass(int spriteId, int num, int *args);
int getSpriteFlagDoubleBuffered(int spriteId);
@@ -145,17 +144,18 @@ public:
int getSpriteSourceImage(int spriteId);
int getSpriteMaskImage(int spriteId);
int getSpriteGeneralProperty(int spriteId, int type);
+ void getSpriteBounds(int spriteId, bool checkGroup, Common::Rect &bound);
void getSpriteImageDim(int spriteId, int32 &w, int32 &h);
void getSpritePosition(int spriteId, int32 &tx, int32 &ty);
void getSpriteDist(int spriteId, int32 &dx, int32 &dy);
int getGroupPriority(int spriteGroupId);
int getGroupDstResNum(int spriteGroupId);
- int getGroupScale_x_ratio_mul(int spriteGroupId);
- int getGroupScale_x_ratio_div(int spriteGroupId);
- int getGroupScale_y_ratio_mul(int spriteGroupId);
- int getGroupScale_y_ratio_div(int spriteGroupId);
- void getGrouptx_ty(int spriteGroupId, int32 &tx, int32 &ty);
+ int getGroupXMul(int spriteGroupId);
+ int getGroupXDiv(int spriteGroupId);
+ int getGroupYMul(int spriteGroupId);
+ int getGroupYDiv(int spriteGroupId);
+ void getGroupPosition(int spriteGroupId, int32 &tx, int32 &ty);
void setSpritePalette(int spriteId, int value);
void setSpriteSourceImage(int spriteId, int value);
@@ -185,8 +185,8 @@ public:
void setSpriteField84(int spriteId, int value);
void setSpriteGeneralProperty(int spriteId, int type, int value);
- void redrawSpriteGroup(int spriteGroupId);
void moveGroupMembers(int spriteGroupId, int value1, int value2);
+ void redrawSpriteGroup(int spriteGroupId);
void setGroupMembersPriority(int spriteGroupId, int value);
void setGroupMembersGroup(int spriteGroupId, int value);
void setGroupMembersUpdateType(int spriteGroupId, int value);
@@ -194,16 +194,17 @@ public:
void setGroupMembersAnimationSpeed(int spriteGroupId, int value);
void setGroupMembersAutoAnimFlag(int spriteGroupId, int value);
void setGroupMembersShadow(int spriteGroupId, int value);
+
+ void moveGroup(int spriteGroupId, int value1, int value2);
void setGroupBounds(int spriteGroupId, int x1, int y1, int x2, int y2);
void setGroupPriority(int spriteGroupId, int value);
void setGroupPosition(int spriteGroupId, int value1, int value2);
- void moveGroup(int spriteGroupId, int value1, int value2);
void setGroupImage(int spriteGroupId, int value);
void setGroupScaling(int spriteGroupId);
- void setGroupScale_x_ratio_mul(int spriteGroupId, int value);
- void setGroupScale_x_ratio_div(int spriteGroupId, int value);
- void setGroupScale_y_ratio_mul(int spriteGroupId, int value);
- void setGroupScale_y_ratio_div(int spriteGroupId, int value);
+ void setGroupXMul(int spriteGroupId, int value);
+ void setGroupXDiv(int spriteGroupId, int value);
+ void setGroupYMul(int spriteGroupId, int value);
+ void setGroupYDiv(int spriteGroupId, int value);
void resetGroupBounds(int spriteGroupId);
void allocTables(int numSprites, int numGroups, int numMaxSprites);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 17:29:37 +0000