From a4854aaddc68b8d06165052067254e997692c4b1 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 24 Aug 2008 09:48:21 +0000 Subject: (svn r14152) -Fix (r14146): Apple decided to use a name I wanted to use... thus making compilation fail on OSX (planetmaker) --- src/gfx_func.h | 2 +- src/gfx_type.h | 2 +- src/gfxinit.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gfx_func.h b/src/gfx_func.h index 4ffc2015b..317f947fa 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -179,6 +179,6 @@ extern DrawPixelInfo *_cur_dpi; */ extern byte _colour_gradient[COLOUR_END][8]; -extern Palette _use_palette; +extern PaletteType _use_palette; #endif /* GFX_FUNC_H */ diff --git a/src/gfx_type.h b/src/gfx_type.h index 6682d4b59..97e987488 100644 --- a/src/gfx_type.h +++ b/src/gfx_type.h @@ -236,7 +236,7 @@ enum FillRectMode { }; /** Palettes OpenTTD supports. */ -enum Palette { +enum PaletteType { PAL_DOS, ///< Use the DOS palette. PAL_WINDOWS, ///< Use the Windows palette. PAL_AUTODETECT, ///< Automatically detect the palette based on the graphics pack. diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index cf6cc8757..4da8df89d 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -22,7 +22,7 @@ #include "table/sprites.h" -Palette _use_palette = PAL_AUTODETECT; +PaletteType _use_palette = PAL_AUTODETECT; struct MD5File { const char * filename; ///< filename @@ -35,7 +35,7 @@ struct MD5File { struct GraphicsSet { const char *name; ///< The name of the graphics set const char *description; ///< Description of the graphics set - Palette palette; ///< Palette of this graphics set + PaletteType palette; ///< Palette of this graphics set MD5File basic[2]; ///< GRF files that always have to be loaded MD5File landscape[3]; ///< Landscape specific grf files const char *base_missing; ///< Warning when one of the base GRF files is missing -- cgit v1.2.3-54-g00ecf