[Scummvm-cvs-logs] SF.net SVN: scummvm:[55288] scummvm/trunk/graphics/video/coktel_decoder.cpp

[drmccoy at users.sourceforge.net]

Revision: 55288
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55288&view=rev
Author:   drmccoy
Date:     2011-01-18 07:03:12 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
GOB: Fix Woodruff video offsets

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktel_decoder.cpp

Modified: scummvm/trunk/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.cpp	2011-01-18 07:02:42 UTC (rev 55287)
+++ scummvm/trunk/graphics/video/coktel_decoder.cpp	2011-01-18 07:03:12 UTC (rev 55288)
@@ -2171,7 +2171,16 @@
 	Common::Rect realRect = rect;
 	Common::Rect fakeRect = rect;
 
-	if ((_blitMode == 1) || (_blitMode == 3)) {
+	if         (_blitMode == 0) {
+
+		realRect = Common::Rect(realRect.left  - _x, realRect.top    - _y,
+		                        realRect.right - _x, realRect.bottom - _y);
+
+		fakeRect = Common::Rect(fakeRect.left  - _x, fakeRect.top    - _y,
+		                        fakeRect.right - _x, fakeRect.bottom - _y);
+
+	} else if ((_blitMode == 1) || (_blitMode == 3)) {
+
 		realRect = Common::Rect(rect.left  / _bytesPerPixel, rect.top,
 		                        rect.right / _bytesPerPixel, rect.bottom);
 
@@ -2180,9 +2189,9 @@
 
 		fakeRect = Common::Rect(fakeRect.left  - _x, fakeRect.top    - _y,
 		                        fakeRect.right - _x, fakeRect.bottom - _y);
-	}
 
-	if (_blitMode == 2) {
+	} else if (_blitMode == 2) {
+
 		fakeRect = Common::Rect(rect.left  * _bytesPerPixel, rect.top,
 		                        rect.right * _bytesPerPixel, rect.bottom);
 
@@ -2191,6 +2200,7 @@
 
 		fakeRect = Common::Rect(fakeRect.left  - _x * _bytesPerPixel, fakeRect.top    - _y,
 		                        fakeRect.right - _x * _bytesPerPixel, fakeRect.bottom - _y);
+
 	}
 
 	realRect.clip(Common::Rect(_surface.w, _surface.h));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.