[Scummvm-cvs-logs] SF.net SVN: scummvm:[53270] scummvm/trunk/engines/sword25/gfx/opengl/ glimage.cpp

[sev at users.sourceforge.net]

Revision: 53270
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53270&view=rev
Author:   sev
Date:     2010-10-12 23:10:57 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: More tweaking to image Blit, doesn't assert anymore.

Though in fact it is all wrong now.

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp

Modified: scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp	2010-10-12 23:10:36 UTC (rev 53269)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp	2010-10-12 23:10:57 UTC (rev 53270)
@@ -181,9 +181,24 @@
 		warning("STUB: Sprite flipping");
 	}
 
-	w = CLIP(x1 + w, 0, (int)_backSurface->w);
-	h = CLIP(y1 + h, 0, (int)_backSurface->h);
+	if (PosX < 0) {
+		w -= PosX;
+		x1 = -PosX;
+		PosX = 0;
+	}
 
+	if (PosY < 0) {
+		h -= PosY;
+		y1 = -PosY;
+		PosY = 0;
+	}
+
+	w = CLIP(PosX + w, 0, (int)_backSurface->w - PosX - 1);
+	h = CLIP(PosY + h, 0, (int)_backSurface->h - PosY - 1);
+
+	if (w == 0 || h == 0)
+		return true;
+
 	// Rendern
 	// TODO:
 	// Die Bedeutung von FLIP_V und FLIP_H ist vertauscht. Allerdings glaubt der Rest der Engine auch daran, daher war es einfacher diesen Fehler


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