[Scummvm-cvs-logs] CVS: scummvm/common scummsys.h,1.20,1.21

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv23087

Modified Files:
	scummsys.h 
Log Message:
typedef NewGuiColor on all platforms; indention

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- scummsys.h	30 Apr 2003 12:43:55 -0000	1.20
+++ scummsys.h	30 Apr 2003 13:40:20 -0000	1.21
@@ -152,39 +152,38 @@
 	#endif
 
 #elif defined(__PALMOS_TRAPS__)	// PALMOS
-  #include <PalmOS.h>
-  #include <stdio.h>
-  #include "extend.h"
+	#include <PalmOS.h>
+	#include <stdio.h>
+	#include "extend.h"
+	
+	#define __PALM_OS__
+	#define scumm_stricmp stricmp// FIXME - this is definitly wrong. Try strcasecmp?
+	
+	#define CHECK_HEAP
+	#define SCUMM_BIG_ENDIAN
+	#define SCUMM_NEED_ALIGNMENT
+	#define NONSTANDARD_SAVE
+	
+	#define FORCEINLINE inline
+	#define CDECL 
+	
+	typedef unsigned char byte;
+	typedef unsigned char uint8;
+	typedef unsigned short uint16;
+	typedef unsigned long uint32;
+	typedef unsigned int uint;
+	typedef signed char int8;
+	typedef signed short int16;
+	typedef signed long int32;
+	typedef Boolean bool;
+	
+	#define START_PACK_STRUCTS pack (1)
+	#define END_PACK_STRUCTS   pack ()
+	#define GCC_PACK
+	#define NORETURN
+	#define NEED_STRDUP
 
-  #define __PALM_OS__
-  #define scumm_stricmp stricmp// FIXME - this is definitly wrong. Try strcasecmp?
-  
-  #define CHECK_HEAP
-  #define SCUMM_BIG_ENDIAN
-  #define SCUMM_NEED_ALIGNMENT
-  #define NONSTANDARD_SAVE
-  
-  #define FORCEINLINE inline
-  #define CDECL 
-  
-  typedef unsigned char byte;
-  typedef unsigned char uint8;
-  typedef unsigned short uint16;
-  typedef unsigned long uint32;
-  typedef unsigned int uint;
-  typedef signed char int8;
-  typedef signed short int16;
-  typedef signed long int32;
-  typedef Boolean bool;
-  
-  #define START_PACK_STRUCTS pack (1)
-  #define END_PACK_STRUCTS   pack ()
-  #define GCC_PACK
-  #define NORETURN
-  #define NEED_STRDUP
-  
-  #define NEWGUI_256
-  typedef byte NewGuiColor;	// NEWGUI to 256 colors
+	#define NEWGUI_256
 
 #elif defined(macintosh)
 	#include <stdio.h>
@@ -414,6 +413,15 @@
 
 	#error No endianness defined
 
+#endif
+
+	
+#if defined(NEWGUI_256)
+	// 256 color only on PalmOS
+	typedef byte NewGuiColor;
+#else
+	// 15/16 bit color mode everywhere else...
+	typedef int16 NewGuiColor;
 #endif
 
 /* Initialized operator new */