Changeset - r4604:56d029090928
Parent rev.
Child rev.
[Not reviewed]
master
0 4 0
peter1138 - 18 years ago 2006-09-15 17:36:54
peter1138@openttd.org
(svn r6456) - Replace single colour scheme for passenger wagons with separate schemes for each of steam, diesel or electric engines. Savegames from the previous revision will not load.
4 files changed with 21 insertions and 6 deletions:
lang/english.txt
3
1
livery.h
3
1
player_gui.c
2
2
vehicle.c
13
2
0 comments (0 inline, 0 general)
lang/english.txt
➞
Show inline comments
 
@@ -2171,13 +2171,15 @@ STR_LIVERY_STEAM
 
STR_LIVERY_DIESEL                                               :Diesel Engine
 
STR_LIVERY_ELECTRIC                                             :Electric Engine
 
STR_LIVERY_MONORAIL                                             :Monorail Engine
 
STR_LIVERY_MAGLEV                                               :Maglev Engine
 
STR_LIVERY_DMU                                                  :DMU
 
STR_LIVERY_EMU                                                  :EMU
 
STR_LIVERY_PASSENGER_WAGON                                      :Passenger Coach
 
STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passenger Coach (Steam)
 
STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passenger Coach (Diesel)
 
STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passenger Coach (Electric)
 
STR_LIVERY_FREIGHT_WAGON                                        :Freight Wagon
 
STR_LIVERY_BUS                                                  :Bus
 
STR_LIVERY_TRUCK                                                :Lorry
 
STR_LIVERY_PASSENGER_SHIP                                       :Passenger Ferry
 
STR_LIVERY_FREIGHT_SHIP                                         :Freight Ship
 
STR_LIVERY_HELICOPTER                                           :Helicopter
livery.h
➞
Show inline comments
 
@@ -13,13 +13,15 @@ typedef enum LiverySchemes {
 
	LS_DIESEL,
 
	LS_ELECTRIC,
 
	LS_MONORAIL,
 
	LS_MAGLEV,
 
	LS_DMU,
 
	LS_EMU,
 
	LS_PASSENGER_WAGON,
 
	LS_PASSENGER_WAGON_STEAM,
 
	LS_PASSENGER_WAGON_DIESEL,
 
	LS_PASSENGER_WAGON_ELECTRIC,
 
	LS_FREIGHT_WAGON,
 

			




	
	
	
		
 
	/* Road vehicles */

			




	
	
	
		
 
	LS_BUS,

			




	
	
	
		
 
	LS_TRUCK,

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    player_gui.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -266,22 +266,22 @@ static const StringID _colour_dropdown[]

			




	
	
	
		
 
	INVALID_STRING_ID

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/* Association of liveries to livery classes */

			




	
	
	
		
 
static const LiveryClass livery_class[LS_END] = {

			




	
	
	
		
 
	LC_OTHER,

			




	
	
	
		
 
	LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL,

			




	
	
	
		
 
	LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL, LC_RAIL,

			




	
	
	
		
 
	LC_ROAD, LC_ROAD,

			




	
	
	
		
 
	LC_SHIP, LC_SHIP,

			




	
	
	
		
 
	LC_AIRCRAFT, LC_AIRCRAFT, LC_AIRCRAFT,

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/* Number of liveries in each class, used to determine the height of the livery window */

			




	
	
	
		
 
static const byte livery_height[] = {

			




	
	
	
		
 
	1,

			




	
	
	
		
 
	9,

			




	
	
	
		
 
	11,

			




	
	
	
		
 
	2,

			




	
	
	
		
 
	2,

			




	
	
	
		
 
	3,

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
typedef struct livery_d {

			




        

    


    
    

    

        

                

                    vehicle.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2319,14 +2319,25 @@ static PalSpriteID GetEngineColourMap(En

			




	
	
	
		
 
					case RAILTYPE_ELECTRIC:

			




	
	
	
		
 
					{

			




	
	
	
		
 
						const RailVehicleInfo *rvi = RailVehInfo(engine_type);

			




	
	
	
		
 

			




	
	
	
		
 
						if (cargo_type == CT_INVALID) cargo_type = rvi->cargo_type;

			




	
	
	
		
 
						if (rvi->flags & RVI_WAGON) {

			




	
	
	
		
 
							scheme = (cargo_type == CT_PASSENGERS || cargo_type == CT_MAIL || cargo_type == CT_VALUABLES) ?

			




	
	
	
		
 
								LS_PASSENGER_WAGON : LS_FREIGHT_WAGON;

			




	
	
	
		
 
							if (cargo_type == CT_PASSENGERS || cargo_type == CT_MAIL || cargo_type == CT_VALUABLES) {

			




	
	
	
		
 
								if (parent_engine_type == INVALID_ENGINE) {

			




	
	
	
		
 
									scheme = LS_PASSENGER_WAGON_STEAM;

			




	
	
	
		
 
								} else {

			




	
	
	
		
 
									switch (RailVehInfo(parent_engine_type)->engclass) {

			




	
	
	
		
 
										case 0: scheme = LS_PASSENGER_WAGON_STEAM; break;

			




	
	
	
		
 
										case 1: scheme = LS_PASSENGER_WAGON_DIESEL; break;

			




	
	
	
		
 
										case 2: scheme = LS_PASSENGER_WAGON_ELECTRIC; break;

			




	
	
	
		
 
									}

			




	
	
	
		
 
								}

			




	
	
	
		
 
							} else {

			




	
	
	
		
 
								scheme = LS_FREIGHT_WAGON;

			




	
	
	
		
 
							}

			




	
	
	
		
 
						} else {

			




	
	
	
		
 
							bool is_mu = HASBIT(_engine_info[engine_type].misc_flags, EF_RAIL_IS_MU);

			




	
	
	
		
 

			




	
	
	
		
 
							switch (rvi->engclass) {

			




	
	
	
		
 
								case 0: scheme = LS_STEAM; break;

			




	
	
	
		
 
								case 1: scheme = is_mu ? LS_DMU : LS_DIESEL; break;

			




        

    



    


    



    



      

      





    
    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