Changeset - r22167:098e772ecba0
[Not reviewed]
master
0 10 1
frosch - 9 years ago 2015-07-26 09:47:17
frosch@openttd.org
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
11 files changed with 48 insertions and 24 deletions:
0 comments (0 inline, 0 general)
projects/openttd_vs100.vcxproj
Show inline comments
 
@@ -898,6 +898,7 @@
 
    <ClInclude Include="..\src\table\sprites.h" />
 
    <ClInclude Include="..\src\table\station_land.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\table\town_land.h" />
 
    <ClInclude Include="..\src\table\townname.h" />
projects/openttd_vs100.vcxproj.filters
Show inline comments
 
@@ -1923,6 +1923,9 @@
 
    <ClInclude Include="..\src\table\strgen_tables.h">
 
      <Filter>Tables</Filter>
 
    </ClInclude>
 
    <ClInclude Include="..\src\table\string_colours.h">
 
      <Filter>Tables</Filter>
 
    </ClInclude>
 
    <ClInclude Include="..\src\..\objs\langs\table\strings.h">
 
      <Filter>Tables</Filter>
 
    </ClInclude>
projects/openttd_vs80.vcproj
Show inline comments
 
@@ -2891,6 +2891,10 @@
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\string_colours.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 
				>
 
			</File>
projects/openttd_vs90.vcproj
Show inline comments
 
@@ -2888,6 +2888,10 @@
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\string_colours.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 
				>
 
			</File>
source.list
Show inline comments
 
@@ -664,6 +664,7 @@ table/roadveh_movement.h
 
table/sprites.h
 
table/station_land.h
 
table/strgen_tables.h
 
table/string_colours.h
 
../objs/langs/table/strings.h
 
table/town_land.h
 
table/townname.h
src/gfx.cpp
Show inline comments
 
@@ -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"
 

	
src/gfx_type.h
Show inline comments
 
@@ -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,
src/table/palettes.h
Show inline comments
 
@@ -147,24 +147,3 @@ static const ExtraPaletteValues _extra_p
 
	  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
 
};
src/table/string_colours.h
Show inline comments
 
new file 100644
 
/* $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
 
};
src/viewport.cpp
Show inline comments
 
@@ -88,7 +88,7 @@
 
#include <map>
 

	
 
#include "table/strings.h"
 
#include "table/palettes.h"
 
#include "table/string_colours.h"
 

	
 
#include "safeguards.h"
 

	
src/widget.cpp
Show inline comments
 
@@ -22,7 +22,7 @@
 

	
 
#include "table/sprites.h"
 
#include "table/strings.h"
 
#include "table/palettes.h"
 
#include "table/string_colours.h"
 

	
 
#include "safeguards.h"
 

	
0 comments (0 inline, 0 general)