aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukaslw2014-06-01 14:28:48 +0200
committerlukaslw2014-06-22 20:08:33 +0200
commit5f222a55ef9c04e41c0bf66001e0e2511c4bbbdd (patch)
tree88f2a9d3fdf2e5c3bf20535cccc3d3fc8d4494b5
parent3864655978c9fd6af94122a8305a0cc69395e683 (diff)
downloadscummvm-rg350-5f222a55ef9c04e41c0bf66001e0e2511c4bbbdd.tar.gz
scummvm-rg350-5f222a55ef9c04e41c0bf66001e0e2511c4bbbdd.tar.bz2
scummvm-rg350-5f222a55ef9c04e41c0bf66001e0e2511c4bbbdd.zip
PRINCE: Hero - checkMasks fix
-rw-r--r--engines/prince/hero.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp
index ea786f289d..4b582d6cc6 100644
--- a/engines/prince/hero.cpp
+++ b/engines/prince/hero.cpp
@@ -187,7 +187,6 @@ Graphics::Surface *Hero::zoomSprite(Graphics::Surface *heroFrame) {
}
void Hero::countDrawPosition() {
- int16 tempMiddleX;
int16 tempMiddleY;
int16 baseX = _moveSet[_moveSetType]->getBaseX();
int16 baseY = _moveSet[_moveSetType]->getBaseY();
@@ -202,21 +201,16 @@ void Hero::countDrawPosition() {
_scaledFrameXSize = getScaledValue(_frameXSize);
_scaledFrameYSize = getScaledValue(_frameYSize);
- //int tempHeroHeight = _scaledFrameYSize; // not used? global?
- int width = _frameXSize / 2;
- tempMiddleX = _middleX - width;
- int z = _middleY;
- int y = _middleY - _scaledFrameYSize;
- _vm->checkMasks(tempMiddleX, y, _scaledFrameXSize, _scaledFrameYSize, z);
-
if (_zoomFactor != 0) {
//notfullSize
_drawX = _middleX - _scaledFrameXSize / 2;
_drawY = tempMiddleY + 1 - _scaledFrameYSize;
+ _vm->checkMasks(_drawX, _drawY - 1, _scaledFrameXSize, _scaledFrameYSize, _middleY);
} else {
//fullSize
_drawX = _middleX - _frameXSize / 2;
_drawY = tempMiddleY + 1 - _frameYSize;
+ _vm->checkMasks(_drawX, _drawY - 1, _frameXSize, _frameYSize, _middleY);
}
}