aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/graphics.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2010-06-30 10:17:54 +0000
committerPaul Gilbert2010-06-30 10:17:54 +0000
commit8de571556012eae3cff13b3b86f8554b5ba070b4 (patch)
tree43e6067e8a4352e8b5b903fd12e98f5bf09eb6c7 /engines/m4/graphics.cpp
parent0c283ed197d839cb81e5957424833700ada1c4ae (diff)
downloadscummvm-rg350-8de571556012eae3cff13b3b86f8554b5ba070b4.tar.gz
scummvm-rg350-8de571556012eae3cff13b3b86f8554b5ba070b4.tar.bz2
scummvm-rg350-8de571556012eae3cff13b3b86f8554b5ba070b4.zip
Removed deprecated destAdjust parameters from the frame drawing code
svn-id: r50524
Diffstat (limited to 'engines/m4/graphics.cpp')
-rw-r--r--engines/m4/graphics.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/m4/graphics.cpp b/engines/m4/graphics.cpp
index 56c40a7402..107bcbc6f9 100644
--- a/engines/m4/graphics.cpp
+++ b/engines/m4/graphics.cpp
@@ -401,8 +401,8 @@ void M4Surface::copyFrom(M4Surface *src, const Common::Rect &srcBounds, int dest
* Copies a given image onto a destination surface with scaling, transferring only pixels that meet
* the specified depth requirement on a secondary surface contain depth information
*/
-void M4Surface::copyFrom(M4Surface *src, int destX, int destY, Common::Point destAdjust,
- int depth, M4Surface *depthsSurface, int scale, int transparentColour) {
+void M4Surface::copyFrom(M4Surface *src, int destX, int destY, int depth,
+ M4Surface *depthsSurface, int scale, int transparentColour) {
if (scale == 100) {
// Copy the specified area
@@ -428,7 +428,7 @@ void M4Surface::copyFrom(M4Surface *src, int destX, int destY, Common::Point des
byte *srcPtr = data + (src->width() * copyRect.top + copyRect.left);
byte *depthsData = depthsSurface->getBasePtr();
byte *depthsPtr = depthsData + (depthsSurface->pitch * destY) + destX;
- byte *destPtr = (byte *)pixels + ((destY + destAdjust.y) * pitch) + destX + destAdjust.x;
+ byte *destPtr = (byte *)pixels + (destY * pitch) + destX;
// 100% scaling variation
for (int rowCtr = 0; rowCtr < copyRect.height(); ++rowCtr) {
@@ -521,7 +521,7 @@ void M4Surface::copyFrom(M4Surface *src, int destX, int destY, Common::Point des
if (spriteHeight <= 0)
return;
- byte *destPixelsP = this->getBasePtr(destX + spriteLeft + destAdjust.x, destY + spriteTop + destAdjust.y);
+ byte *destPixelsP = this->getBasePtr(destX + spriteLeft, destY + spriteTop);
const byte *depthPixelsP = depthsSurface->getBasePtr(destX + spriteLeft, destY + spriteTop);
spriteLeft = (spriteLeft * (normalFrame ? 1 : -1));