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

replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
frosch 9 years ago
parent 3f58ed6b1d
commit 4830497f0b

@ -898,6 +898,7 @@
<ClInclude Include="..\src\table\sprites.h" /> <ClInclude Include="..\src\table\sprites.h" />
<ClInclude Include="..\src\table\station_land.h" /> <ClInclude Include="..\src\table\station_land.h" />
<ClInclude Include="..\src\table\strgen_tables.h" /> <ClInclude Include="..\src\table\strgen_tables.h" />
<ClInclude Include="..\src\table\string_colours.h" />
<ClInclude Include="..\src\..\objs\langs\table\strings.h" /> <ClInclude Include="..\src\..\objs\langs\table\strings.h" />
<ClInclude Include="..\src\table\town_land.h" /> <ClInclude Include="..\src\table\town_land.h" />
<ClInclude Include="..\src\table\townname.h" /> <ClInclude Include="..\src\table\townname.h" />

@ -1923,6 +1923,9 @@
<ClInclude Include="..\src\table\strgen_tables.h"> <ClInclude Include="..\src\table\strgen_tables.h">
<Filter>Tables</Filter> <Filter>Tables</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\table\string_colours.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\..\objs\langs\table\strings.h"> <ClInclude Include="..\src\..\objs\langs\table\strings.h">
<Filter>Tables</Filter> <Filter>Tables</Filter>
</ClInclude> </ClInclude>

@ -2890,6 +2890,10 @@
RelativePath=".\..\src\table\strgen_tables.h" RelativePath=".\..\src\table\strgen_tables.h"
> >
</File> </File>
<File
RelativePath=".\..\src\table\string_colours.h"
>
</File>
<File <File
RelativePath=".\..\src\..\objs\langs\table\strings.h" RelativePath=".\..\src\..\objs\langs\table\strings.h"
> >

@ -2887,6 +2887,10 @@
RelativePath=".\..\src\table\strgen_tables.h" RelativePath=".\..\src\table\strgen_tables.h"
> >
</File> </File>
<File
RelativePath=".\..\src\table\string_colours.h"
>
</File>
<File <File
RelativePath=".\..\src\..\objs\langs\table\strings.h" RelativePath=".\..\src\..\objs\langs\table\strings.h"
> >

@ -664,6 +664,7 @@ table/roadveh_movement.h
table/sprites.h table/sprites.h
table/station_land.h table/station_land.h
table/strgen_tables.h table/strgen_tables.h
table/string_colours.h
../objs/langs/table/strings.h ../objs/langs/table/strings.h
table/town_land.h table/town_land.h
table/townname.h table/townname.h

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

@ -237,7 +237,7 @@ enum Colours {
}; };
template <> struct EnumPropsT<Colours> : MakeEnumPropsT<Colours, byte, COLOUR_BEGIN, COLOUR_END, INVALID_COLOUR, 4> {}; 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 { enum TextColour {
TC_BEGIN = 0x00, TC_BEGIN = 0x00,
TC_FROMSTRING = 0x00, TC_FROMSTRING = 0x00,

@ -147,24 +147,3 @@ static const ExtraPaletteValues _extra_palette_values = {
M(116, 180, 196), M(148, 200, 216), M(180, 220, 232) } M(116, 180, 196), M(148, 200, 216), M(180, 220, 232) }
}; };
#undef M #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
};

@ -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
};

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

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

Loading…
Cancel
Save