diff options
| author | Johannes Schickel | 2008-05-03 19:23:45 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-03 19:23:45 +0000 |
| commit | d5545bd8c5589e8d919350b932eaed76b28e83e9 (patch) | |
| tree | 8418c5c56c25d97202fb544660bf6cbf88123610 /engines/kyra/animator_v2.cpp | |
| parent | 043f92cb230f6afc83e5635cc1610c5d166e105f (diff) | |
| download | scummvm-rg350-d5545bd8c5589e8d919350b932eaed76b28e83e9.tar.gz scummvm-rg350-d5545bd8c5589e8d919350b932eaed76b28e83e9.tar.bz2 scummvm-rg350-d5545bd8c5589e8d919350b932eaed76b28e83e9.zip | |
- Moved newShape/temporaryScript code to KyraEngine_v2.
- Renamed newShape/temporaryScript code to animationScript.
svn-id: r31841
Diffstat (limited to 'engines/kyra/animator_v2.cpp')
| -rw-r--r-- | engines/kyra/animator_v2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/animator_v2.cpp index 83081ca105..af22056eee 100644 --- a/engines/kyra/animator_v2.cpp +++ b/engines/kyra/animator_v2.cpp @@ -163,14 +163,14 @@ void KyraEngine_v2::addItemToAnimList(int item) { animObj->xPos2 = animObj->xPos1 = _itemList[item].x; animObj->yPos2 = animObj->yPos1 = _itemList[item].y; - animObj->shapePtr = getShapePtr(getItemShape(itemId)); + animObj->shapePtr = getShapePtr(itemId + _desc.itemShapeStart); animSetupPaletteEntry(animObj); - animObj->shapeIndex2 = animObj->shapeIndex1 = getItemShape(itemId); + animObj->shapeIndex2 = animObj->shapeIndex1 = itemId + _desc.itemShapeStart; int scaleY, scaleX; scaleY = scaleX = getScale(animObj->xPos1, animObj->yPos1); - uint8 *shapePtr = getShapePtr(getItemShape(itemId)); + uint8 *shapePtr = getShapePtr(itemId + _desc.itemShapeStart); animObj->xPos3 = (animObj->xPos2 -= (screen_v2()->getShapeScaledWidth(shapePtr, scaleX) >> 1)); animObj->yPos3 = (animObj->yPos2 -= screen_v2()->getShapeScaledHeight(shapePtr, scaleY)); |