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

11 files changed, 48 insertions, 24 deletions

diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index cfff53614..37f994803 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -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" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index b5dcdfc5a..06800ffda 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -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>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 17c2d8d4f..f859fcf18 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -2891,6 +2891,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\table\string_colours.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
 			</File>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 666760ce7..0cf6627fe 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2888,6 +2888,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\table\string_colours.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
 			</File>
diff --git a/source.list b/source.list
index 3b66ab9fc..df35cdd26 100644
--- a/source.list
+++ b/source.list
@@ -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
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 26d8b6670..bc7f93244 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -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"
 
diff --git a/src/gfx_type.h b/src/gfx_type.h
index 57a7ca324..d25abff21 100644
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -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,
diff --git a/src/table/palettes.h b/src/table/palettes.h
index e190134c9..93cb7385e 100644
--- a/src/table/palettes.h
+++ b/src/table/palettes.h
@@ -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
-};
diff --git a/src/table/string_colours.h b/src/table/string_colours.h
new file mode 100644
index 000000000..1e3b02bd6
--- /dev/null
+++ b/src/table/string_colours.h
@@ -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
+};
diff --git a/src/viewport.cpp b/src/viewport.cpp
index c1d4d61b4..0dfc894f9 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -88,7 +88,7 @@
 #include <map>
 
 #include "table/strings.h"
-#include "table/palettes.h"
+#include "table/string_colours.h"
 
 #include "safeguards.h"
 
diff --git a/src/widget.cpp b/src/widget.cpp
index 350db9d14..3b50f710d 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -22,7 +22,7 @@
 
 #include "table/sprites.h"
 #include "table/strings.h"
-#include "table/palettes.h"
+#include "table/string_colours.h"
 
 #include "safeguards.h"