[Scummvm-cvs-logs] SF.net SVN: scummvm:[39450] scummvm/trunk/engines/sci/gfx/gfx_system.h

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Mar 16 18:25:13 CET 2009


Revision: 39450
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39450&view=rev
Author:   thebluegr
Date:     2009-03-16 17:25:13 +0000 (Mon, 16 Mar 2009)

Log Message:
-----------
Changed the temporary helper functions to defines

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/gfx_system.h

Modified: scummvm/trunk/engines/sci/gfx/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-03-16 15:36:09 UTC (rev 39449)
+++ scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-03-16 17:25:13 UTC (rev 39450)
@@ -129,15 +129,10 @@
 	return rect;
 }
 
-// Temporary helper functions to ease the transition from rect_t to Common::Rect
-static rect_t toSCIRect(Common::Rect in) {
-	return gfx_rect(in.left, in.top, in.width(), in.height());
-}
+// Temporary helper defines to ease the transition from rect_t to Common::Rect
+#define toSCIRect(in) gfx_rect(in.left, in.top, in.width(), in.height())
+#define toCommonRect(in) Common::Rect(in.x, in.y, in.x + in.width, in.y + in.height)
 
-static Common::Rect toCommonRect(rect_t in) {
-	return Common::Rect(in.x, in.y, in.x + in.width, in.y + in.height);
-}
-
 #define GFX_PRINT_RECT(rect) (rect).x, (rect).y, (rect).width, (rect).height
 
 #define OVERLAP(a, b, z, zl) (a.z >= b.z && a.z < (b.z + b.zl))


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




More information about the Scummvm-git-logs mailing list