diff options
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/script_v100he.cpp | 4 | ||||
-rw-r--r-- | scumm/script_v90he.cpp | 4 | ||||
-rw-r--r-- | scumm/sprite_he.cpp | 4 | ||||
-rw-r--r-- | scumm/sprite_he.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index fa07b2964c..5654a7b713 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -884,7 +884,7 @@ void ScummEngine_v100he::o100_setSpriteGroupInfo() { if (!_curSpriteGroupId) break; - _sprite->moveGroup(_curSpriteGroupId, value1, value2); + _sprite->setGroupPosition(_curSpriteGroupId, value1, value2); break; case 18: value4 = pop(); @@ -972,7 +972,7 @@ void ScummEngine_v100he::o100_setSpriteGroupInfo() { if (!_curSpriteGroupId) break; - _sprite->setGroupinc_tx_ty(_curSpriteGroupId, value1, value2); + _sprite->moveGroup(_curSpriteGroupId, value1, value2); break; case 52: copyScriptString(string, sizeof(string)); diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index c8f3f0b436..c48c4e9c34 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -1614,7 +1614,7 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { if (!_curSpriteGroupId) break; - _sprite->setGroupinc_tx_ty(_curSpriteGroupId, value1, value2); + _sprite->moveGroup(_curSpriteGroupId, value1, value2); break; case 20: _curSpriteGroupId = pop(); @@ -1632,7 +1632,7 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { if (!_curSpriteGroupId) break; - _sprite->moveGroup(_curSpriteGroupId, value1, value2); + _sprite->setGroupPosition(_curSpriteGroupId, value1, value2); break; case 30: value4 = pop(); diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index f29ecc2288..ac9e1a1b27 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -951,7 +951,7 @@ void Sprite::setGroupPriority(int spriteGroupId, int value) { } } -void Sprite::moveGroup(int spriteGroupId, int value1, int value2) { +void Sprite::setGroupPosition(int spriteGroupId, int value1, int value2) { checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d"); if (_spriteGroups[spriteGroupId].tx != value1 || _spriteGroups[spriteGroupId].ty != value2) { @@ -961,7 +961,7 @@ void Sprite::moveGroup(int spriteGroupId, int value1, int value2) { } } -void Sprite::setGroupinc_tx_ty(int spriteGroupId, int value1, int value2) { +void Sprite::moveGroup(int spriteGroupId, int value1, int value2) { checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d"); if (value1 || value2) { diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h index 4fab70c90a..f9251968cf 100644 --- a/scumm/sprite_he.h +++ b/scumm/sprite_he.h @@ -196,8 +196,8 @@ public: void setGroupMembersShadow(int spriteGroupId, int value); 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 setGroupinc_tx_ty(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); |