Correct return values were lost in last commit.

Also revert cleanup from scumm/akos.cpp revision 1.185.
Clipping isn't compatible, due to possible negative values.

svn-id: r17294

1 files changed, 26 insertions, 4 deletions

diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 920141d4af..dc33dec3b4 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -1219,15 +1219,37 @@ byte AkosRenderer::codec32(int xmoveCur, int ymoveCur) {
 		dst.left = _actorX + xmoveCur;
 	}
 
+	src.top = src.left = 0;
+	src.right = _width;
+	src.bottom = _height;
+
 	dst.top = _actorY + ymoveCur;
 	dst.right = dst.left + _width;
 	dst.bottom = dst.top + _height;
 
-	dst.clip(_clipOverride);
-	src = dst;
-	src.moveTo(0, 0);
+	int diff;
+	diff = dst.left - _clipOverride.left;
+	if (diff < 0) {
+		src.left -= diff;
+		dst.left -= diff;
+	}
+	diff = dst.right - _clipOverride.right;
+	if (diff > 0) {
+		src.right -= diff;
+		dst.right -= diff;
+	}
+	diff = dst.top - _clipOverride.top;
+	if (diff < 0) {
+		src.top -= diff;
+		dst.top -= diff;
+	}
+	diff = dst.bottom - _clipOverride.bottom;
+	if (diff > 0) {
+		src.bottom -= diff;
+		dst.bottom -= diff;
+	}	
 
-	markRectAsDirty(dst);
+	_vm->markRectAsDirty(kMainVirtScreen, dst);
 
 	if (_draw_top > dst.top)
 		_draw_top = dst.top;