mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14152) -Fix (r14146): Apple decided to use a name I wanted to use... thus making compilation fail on OSX (planetmaker)

release/0.7
rubidium 2008-08-24 09:48:21 +00:00
parent 8c73b5c42d
commit a4854aaddc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx_func.h
View File

@ -179,6 +179,6 @@ extern DrawPixelInfo *_cur_dpi;
*/ */
extern byte _colour_gradient[COLOUR_END][8]; extern byte _colour_gradient[COLOUR_END][8];
extern Palette _use_palette; extern PaletteType _use_palette;
#endif /* GFX_FUNC_H */ #endif /* GFX_FUNC_H */

2
src/gfx_type.h
View File

@ -236,7 +236,7 @@ enum FillRectMode {
}; };
/** Palettes OpenTTD supports. */ /** Palettes OpenTTD supports. */
enum Palette { enum PaletteType {
PAL_DOS, ///< Use the DOS palette. PAL_DOS, ///< Use the DOS palette.
PAL_WINDOWS, ///< Use the Windows palette. PAL_WINDOWS, ///< Use the Windows palette.
PAL_AUTODETECT, ///< Automatically detect the palette based on the graphics pack. PAL_AUTODETECT, ///< Automatically detect the palette based on the graphics pack.

4
src/gfxinit.cpp
View File

@ -22,7 +22,7 @@
#include "table/sprites.h" #include "table/sprites.h"
Palette _use_palette = PAL_AUTODETECT; PaletteType _use_palette = PAL_AUTODETECT;
struct MD5File { struct MD5File {
const char * filename; ///< filename const char * filename; ///< filename
@ -35,7 +35,7 @@ struct MD5File {
struct GraphicsSet { struct GraphicsSet {
const char *name; ///< The name of the graphics set const char *name; ///< The name of the graphics set
const char *description; ///< Description 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 basic[2]; ///< GRF files that always have to be loaded
MD5File landscape[3]; ///< Landscape specific grf files MD5File landscape[3]; ///< Landscape specific grf files
const char *base_missing; ///< Warning when one of the base GRF files is missing const char *base_missing; ///< Warning when one of the base GRF files is missing