Changeset - r22167:098e772ecba0
Parent rev.
Child rev.
[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:
projects/openttd_vs100.vcxproj
1
projects/openttd_vs100.vcxproj.filters
3
projects/openttd_vs80.vcproj
4
projects/openttd_vs90.vcproj
4
source.list
1
src/gfx.cpp
1
src/gfx_type.h
1
1
src/table/palettes.h
21
src/table/string_colours.h
31
src/viewport.cpp
1
1
src/widget.cpp
1
1
0 comments (0 inline, 0 general)
projects/openttd_vs100.vcxproj
➞
Show inline comments
 
@@ -895,12 +895,13 @@
 
    <ClInclude Include="..\src\table\road_land.h" />
 
    <ClInclude Include="..\src\table\roadveh_movement.h" />
 
    <ClInclude Include="..\src\..\objs\settings\table\settings.h" />
 
    <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" />
 
    <ClInclude Include="..\src\table\track_land.h" />
 
    <ClInclude Include="..\src\table\train_cmd.h" />
 
    <ClInclude Include="..\src\table\tree_land.h" />
projects/openttd_vs100.vcxproj.filters
➞
Show inline comments
 
@@ -1920,12 +1920,15 @@
 
    <ClInclude Include="..\src\table\station_land.h">
 
      <Filter>Tables</Filter>
 
    </ClInclude>
 
    <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>
 
    <ClInclude Include="..\src\table\town_land.h">
 
      <Filter>Tables</Filter>
 
    </ClInclude>
projects/openttd_vs80.vcproj
➞
Show inline comments
 
@@ -2888,12 +2888,16 @@
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\strgen_tables.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\string_colours.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\town_land.h"
 
				>
projects/openttd_vs90.vcproj
➞
Show inline comments
 
@@ -2885,12 +2885,16 @@
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\strgen_tables.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\string_colours.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\table\town_land.h"
 
				>
source.list
➞
Show inline comments
 
@@ -661,12 +661,13 @@ table/railtypes.h
 
table/road_land.h
 
table/roadveh_movement.h
 
../objs/settings/table/settings.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
 
table/track_land.h
 
table/train_cmd.h
 
table/tree_land.h
src/gfx.cpp
➞
Show inline comments
 
@@ -20,12 +20,13 @@
 
#include "network/network.h"
 
#include "network/network_func.h"
 
#include "window_func.h"
 
#include "newgrf_debug.h"
 

			




	
	
	
		
 
#include "table/palettes.h"

			




	
	
	
		
 
#include "table/string_colours.h"

			




	
	
	
		
 
#include "table/sprites.h"

			




	
	
	
		
 
#include "table/control_codes.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "safeguards.h"

			




	
	
	
		
 

			




	
	
	
		
 
byte _dirkeys;        ///< 1 = left, 2 = up, 4 = right, 8 = down

			




        

    


    
    

    

        

                

                    src/gfx_type.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -234,13 +234,13 @@ enum Colours {

			




	
	
	
		
 
	COLOUR_WHITE,

			




	
	
	
		
 
	COLOUR_END,

			




	
	
	
		
 
	INVALID_COLOUR = 0xFF,

			




	
	
	
		
 
};

			




	
	
	
		
 
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,

			




	
	
	
		
 
	TC_BLUE        = 0x00,

			




	
	
	
		
 
	TC_SILVER      = 0x01,

			




	
	
	
		
 
	TC_GOLD        = 0x02,

			




        

    


    
    

    

        

                

                    src/table/palettes.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -144,27 +144,6 @@ static const ExtraPaletteValues _extra_p

			




	
	
	
		
 
	{ M(216, 244, 252), M(180, 220, 232), M(148, 200, 216), M(116, 180, 196),

			




	
	
	
		
 
	  M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184),

			




	
	
	
		
 
	  M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184), M( 92, 164, 184),

			




	
	
	
		
 
	  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
                    
                

        

        

            



	
	
		
 
@@ -85,13 +85,13 @@

			




	
	
	
		
 
#include "viewport_sprite_sorter.h"

			




	
	
	
		
 
#include "bridge_map.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <map>

			




	
	
	
		
 

			




	
	
	
		
 
#include "table/strings.h"

			




	
	
	
		
 
#include "table/palettes.h"

			




	
	
	
		
 
#include "table/string_colours.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "safeguards.h"

			




	
	
	
		
 

			




	
	
	
		
 
Point _tile_fract_coords;

			




	
	
	
		
 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/widget.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,13 +19,13 @@

			




	
	
	
		
 
#include "core/geometry_func.hpp"

			




	
	
	
		
 
#include "settings_type.h"

			




	
	
	
		
 
#include "querystring_gui.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "table/sprites.h"

			




	
	
	
		
 
#include "table/strings.h"

			




	
	
	
		
 
#include "table/palettes.h"

			




	
	
	
		
 
#include "table/string_colours.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "safeguards.h"

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Compute the vertical position of the draggable part of scrollbar

			




	
	
	
		
 
 * @param sb     Scrollbar list data

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support