typedef NewGuiColor on all platforms; indention

svn-id: r7225

1 files changed, 41 insertions, 33 deletions

diff --git a/common/scummsys.h b/common/scummsys.h
index 58af7e9a4d..3bdd10440f 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -152,39 +152,38 @@
 	#endif
 
 #elif defined(__PALMOS_TRAPS__)	// PALMOS
-  #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 NEWGUI_256
-  typedef byte NewGuiColor;	// NEWGUI to 256 colors
+	#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 NEWGUI_256
 
 #elif defined(macintosh)
 	#include <stdio.h>
@@ -416,6 +415,15 @@
 
 #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 */
 // FIXME - get rid of these new/delete overrides!!! They conflict with the
 // Standard C++ library, and they are only there to support lazy programmers anyway.