dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)

Browse Source
This commit is contained in:
frosch
2015-07-26 09:47:17 +00:00
parent 932aaa8cb5
commit 67ae231f1b
11 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gfx.cpp
View File

@@ -23,6 +23,7 @@
#include "newgrf_debug.h"
#include "table/palettes.h"
#include "table/string_colours.h"
#include "table/sprites.h"
#include "table/control_codes.h"

2
src/gfx_type.h
View File

@@ -237,7 +237,7 @@ enum Colours {
};
template <> struct EnumPropsT<Colours> : MakeEnumPropsT<Colours, byte, COLOUR_BEGIN, COLOUR_END, INVALID_COLOUR, 4> {};
/** Colour of the strings, see _string_colourmap in table/palettes.h or docs/ottd-colourtext-palette.png */
/** Colour of the strings, see _string_colourmap in table/string_colours.h or docs/ottd-colourtext-palette.png */
enum TextColour {
TC_BEGIN = 0x00,
TC_FROMSTRING = 0x00,

21
src/table/palettes.h
View File

@@ -147,24 +147,3 @@ static const ExtraPaletteValues _extra_palette_values = {
M(116, 180, 196), M(148, 200, 216), M(180, 220, 232) }
};
#undef M
/** Colour mapping for the TextColours. */
static const byte _string_colourmap[17] = {
150, // TC_BLUE
12, // TC_SILVER
189, // TC_GOLD
184, // TC_RED
174, // TC_PURPLE
30, // TC_LIGHT_BROWN
195, // TC_ORANGE
209, // TC_GREEN
68, // TC_YELLOW
95, // TC_DARK_GREEN
79, // TC_CREAM
116, // TC_BROWN
15, // TC_WHITE
152, // TC_LIGHT_BLUE
6, // TC_GREY
133, // TC_DARK_BLUE
1, // TC_BLACK
};

31
src/table/string_colours.h Normal file
View File

@@ -0,0 +1,31 @@
/* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file string_colours.h The colour translation of GRF's strings. */
/** Colour mapping for the TextColours. */
static const byte _string_colourmap[17] = {
150, // TC_BLUE
12, // TC_SILVER
189, // TC_GOLD
184, // TC_RED
174, // TC_PURPLE
30, // TC_LIGHT_BROWN
195, // TC_ORANGE
209, // TC_GREEN
68, // TC_YELLOW
95, // TC_DARK_GREEN
79, // TC_CREAM
116, // TC_BROWN
15, // TC_WHITE
152, // TC_LIGHT_BLUE
6, // TC_GREY
133, // TC_DARK_BLUE
1, // TC_BLACK
};

2
src/viewport.cpp
View File

@@ -88,7 +88,7 @@
#include <map>
#include "table/strings.h"
#include "table/palettes.h"
#include "table/string_colours.h"
#include "safeguards.h"

2
src/widget.cpp
View File

@@ -22,7 +22,7 @@
#include "table/sprites.h"
#include "table/strings.h"
#include "table/palettes.h"
#include "table/string_colours.h"
#include "safeguards.h"