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

[mthreepwood at users.sourceforge.net]

Revision: 43410
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43410&view=rev
Author:   mthreepwood
Date:     2009-08-15 14:50:21 +0000 (Sat, 15 Aug 2009)

Log Message:
-----------
Fix compile when compiling with --disable-he

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/scumm/akos.cpp
    scummvm/branches/gsoc2009-16bit/engines/scumm/cursor.cpp

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/akos.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/akos.cpp	2009-08-15 14:13:48 UTC (rev 43409)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/akos.cpp	2009-08-15 14:50:21 UTC (rev 43410)
@@ -299,6 +299,7 @@
 	if (size > 256)
 		error("akos_setPalette: %d is too many colors", size);
 
+#ifdef ENABLE_HE
 	if (_vm->_game.features & GF_16BIT_COLOR) {
 		if (_paletteNum) {
 			for (i = 0; i < size; i++)
@@ -317,10 +318,13 @@
 		for (i = 0; i < size; i++)
 			_palette[i] = (byte)_vm->_hePalettes[_paletteNum * _vm->_hePaletteSlot + 768 + akpl[i]];
 	} else {
+#endif
 		for (i = 0; i < size; i++) {
 			_palette[i] = new_palette[i] != 0xFF ? new_palette[i] : akpl[i];
 		}
+#ifdef ENABLE_HE
 	}
+#endif
 
 	if (_vm->_game.heversion == 70) {
 		for (i = 0; i < size; i++)

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/cursor.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/cursor.cpp	2009-08-15 14:13:48 UTC (rev 43409)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/cursor.cpp	2009-08-15 14:50:21 UTC (rev 43410)
@@ -194,15 +194,19 @@
 		for (j = 0; j < 32; j++) {
 			switch ((p & (0x3 << 14)) >> 14) {
 				case 1:
+#ifdef ENABLE_HE
 					if (_bitDepth == 2)
 						WRITE_UINT16(_grabbedCursor + 64 * i + j * 2, get16BitColor(palette[4], palette[5], palette[6]));
 					else
+#endif
 						_grabbedCursor[32 * i + j] = 0xfe;
 					break;
 				case 2:
+#ifdef ENABLE_HE
 					if (_bitDepth == 2)
 						WRITE_UINT16(_grabbedCursor + 64 * i + j * 2, get16BitColor(palette[0], palette[1], palette[2]));
 					else
+#endif
 						_grabbedCursor[32 * i + j] = 0xfd;
 					break;
 				default:


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