Mercurial > hg > openttd
changeset 9995:a5aaa00e55ae draft
(svn r14152) -Fix (r14146): Apple decided to use a name I wanted to use... thus making compilation fail on OSX (planetmaker)
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sun, 24 Aug 2008 09:48:21 +0000 |
| parents | 4687a554c837 |
| children | 091e875c5ade |
| files | src/gfx_func.h src/gfx_type.h src/gfxinit.cpp |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -179,6 +179,6 @@ */ extern byte _colour_gradient[COLOUR_END][8]; -extern Palette _use_palette; +extern PaletteType _use_palette; #endif /* GFX_FUNC_H */
--- a/src/gfx_type.h +++ b/src/gfx_type.h @@ -236,7 +236,7 @@ }; /** 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.
--- 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 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