[Scummvm-cvs-logs] SF.net SVN: scummvm:[41581] scummvm/branches/gsoc2009-16bit

[upthorn at users.sourceforge.net]

Revision: 41581
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41581&view=rev
Author:   upthorn
Date:     2009-06-16 09:15:06 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
Corrected oversight in earlier ifdef simplification which leads to compilation failure if ENABLE_16BIT is not defined.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/backends/platform/sdl/sdl.h
    scummvm/branches/gsoc2009-16bit/common/system.h

Modified: scummvm/branches/gsoc2009-16bit/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/backends/platform/sdl/sdl.h	2009-06-16 09:04:37 UTC (rev 41580)
+++ scummvm/branches/gsoc2009-16bit/backends/platform/sdl/sdl.h	2009-06-16 09:15:06 UTC (rev 41581)
@@ -133,11 +133,9 @@
 	virtual void warpMouse(int x, int y); // overloaded by CE backend (FIXME)
 
 	// Set the bitmap that's used when drawing the cursor.
-#ifdef ENABLE_16BIT
 	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale); // overloaded by CE backend (FIXME)
+#ifdef ENABLE_16BIT
 	virtual void setCursorFormat(Graphics::PixelFormat format);
-#else
-	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale); // overloaded by CE backend (FIXME)
 #endif
 
 	// Set colors of cursor palette

Modified: scummvm/branches/gsoc2009-16bit/common/system.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/common/system.h	2009-06-16 09:04:37 UTC (rev 41580)
+++ scummvm/branches/gsoc2009-16bit/common/system.h	2009-06-16 09:15:06 UTC (rev 41581)
@@ -719,11 +719,9 @@
 	 * @param keycolor			transparency color index
 	 * @param cursorTargetScale	scale factor which cursor is designed for
 	 */
-#ifdef ENABLE_16BIT
 	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int cursorTargetScale = 1) = 0;
+#ifdef ENABLE_16BIT
 	virtual void setCursorFormat(Graphics::PixelFormat format) = 0;
-#else
-	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int cursorTargetScale = 1) = 0;
 #endif
 
 


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