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

[sev at users.sourceforge.net]

Revision: 41543
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41543&view=rev
Author:   sev
Date:     2009-06-15 11:46:28 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
Fix compilation when 16BIT code is disabled.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/backends/platform/sdl/graphics.cpp
    scummvm/branches/gsoc2009-16bit/graphics/cursorman.h

Modified: scummvm/branches/gsoc2009-16bit/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/backends/platform/sdl/graphics.cpp	2009-06-15 11:37:07 UTC (rev 41542)
+++ scummvm/branches/gsoc2009-16bit/backends/platform/sdl/graphics.cpp	2009-06-15 11:46:28 UTC (rev 41543)
@@ -155,6 +155,8 @@
 
 #ifdef ENABLE_16BIT
 	if (_transactionDetails.sizeChanged || _transactionDetails.formatChanged) {
+#else
+	if (_transactionDetails.sizeChanged) {
 #endif
 		unloadGFXMode();
 		if (!loadGFXMode()) {

Modified: scummvm/branches/gsoc2009-16bit/graphics/cursorman.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/graphics/cursorman.h	2009-06-15 11:37:07 UTC (rev 41542)
+++ scummvm/branches/gsoc2009-16bit/graphics/cursorman.h	2009-06-15 11:46:28 UTC (rev 41543)
@@ -60,11 +60,11 @@
 	 *       useful to push a "dummy" cursor and modify it later. The
 	 *       cursor will be added to the stack, but not to the backend.
 	 */
-//#ifdef ENABLE_16BIT
+#ifdef ENABLE_16BIT
 	void pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1);
-//#else
-//	void pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int targetScale = 1);
-//#endif
+#else
+	void pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int targetScale = 1);
+#endif
 
 	/**
 	 * Pop a cursor from the stack, and restore the previous one to the
@@ -85,11 +85,11 @@
 	 * @param keycolor	the index for the transparent color
 	 * @param targetScale	the scale for which the cursor is designed
 	 */
-//#ifdef ENABLE_16BIT
+#ifdef ENABLE_16BIT
 	void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1);
-//#else
-//	void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int targetScale = 1);
-//#endif
+#else
+	void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int targetScale = 1);
+#endif
 
 	/**
 	 * Pop all of the cursors and cursor palettes from their respective stacks.


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